diff options
Diffstat (limited to 'jjb/aai')
| -rw-r--r-- | jjb/aai/aai-aai-common.yaml | 6 | ||||
| -rw-r--r-- | jjb/aai/aai-babel.yaml | 2 | ||||
| -rw-r--r-- | jjb/aai/aai-graphadmin.yaml | 2 | ||||
| -rw-r--r-- | jjb/aai/aai-graphgraph.yaml | 2 | ||||
| -rw-r--r-- | jjb/aai/aai-model-loader.yaml | 4 | ||||
| -rw-r--r-- | jjb/aai/aai-resources.yaml | 10 | ||||
| -rw-r--r-- | jjb/aai/aai-schema-service.yaml | 2 | ||||
| -rw-r--r-- | jjb/aai/aai-sparky-be.yaml | 4 | ||||
| -rw-r--r-- | jjb/aai/aai-traversal.yaml | 8 |
9 files changed, 20 insertions, 20 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index c43e70277..c5f819466 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -88,7 +88,7 @@ - '{project-name}-{stream}-merge-docker' - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' project-name: 'aai-aai-common' @@ -104,13 +104,13 @@ mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' files: 'Dockerfiles/aai-common/**' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g java-version: openjdk8 - project: name: 'aai-aai-common-whitesource' project-name: 'aai-aai-common' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-params: '-P spring-boot-2-1' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 823b7d43c..df9699e0c 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -19,7 +19,7 @@ sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 12b6efcd4..c009f1f2a 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -18,7 +18,7 @@ sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 484c8be59..173ffe56b 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -18,7 +18,7 @@ sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index bfc961eb0..4fd9f9495 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -19,7 +19,7 @@ sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -B -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -87,7 +87,7 @@ - project: name: 'aai-model-loader-whitesource' project-name: 'aai-model-loader' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-settings: 'aai-model-loader-settings' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 6ffc4234c..8b3d49ea3 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -10,9 +10,9 @@ project-name: 'aai-resources' jobs: - '{project-name}-{stream}-verify-java': - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g - '{project-name}-{stream}-merge-java': - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g - gerrit-maven-stage: mvn-params: '-DskipTests' sign-artifacts: true @@ -21,7 +21,7 @@ sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -50,7 +50,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g project: 'aai/resources' project-name: 'aai-resources' branch: 'master' @@ -89,7 +89,7 @@ - project: name: 'aai-resources-whitesource' project-name: 'aai-resources' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-settings: 'aai-resources-settings' diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 8fdaf1187..b1ef066dc 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -18,7 +18,7 @@ sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index a1a5c3352..f06e57ed6 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -19,7 +19,7 @@ sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -86,7 +86,7 @@ - project: name: 'aai-sparky-be-whitesource' project-name: 'aai-sparky-be' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-settings: 'aai-sparky-be-settings' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 7273498f1..9a7683911 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -10,9 +10,9 @@ project-name: 'aai-traversal' jobs: - '{project-name}-{stream}-verify-java': - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g - '{project-name}-{stream}-merge-java': - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g - gerrit-maven-stage: mvn-params: '-DskipTests' sign-artifacts: true @@ -21,7 +21,7 @@ sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -49,7 +49,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g project: 'aai/traversal' project-name: 'aai-traversal' branch: 'master' |