From 61a0f59c466bf12a84b8b2b5d0031589bcdadc0d Mon Sep 17 00:00:00 2001 From: Bengt Thuree Date: Wed, 28 Sep 2022 09:58:25 +1000 Subject: [PATCH] Chore: Move to ubuntu2004-docker jjb/aai/aai-aai-common.yaml jjb/aai/aai-babel.yaml jjb/aai/aai-graphadmin.yaml jjb/aai/aai-graphgraph.yaml jjb/aai/aai-model-loader.yaml jjb/aai/aai-resources.yaml jjb/aai/aai-schema-service.yaml jjb/aai/aai-sparky-be.yaml jjb/aai/aai-traversal.yaml jjb/ccsdk/apps.yaml jjb/cli/cli.yaml jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml jjb/dcaegen2/dcaegen2-collectors-datafile.yaml jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml jjb/dcaegen2/dcaegen2-collectors-restconf.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree Signed-off-by: Jessica Wagantall Change-Id: If1f1bdbf0c61acb634a5a5e6afb1479f32322ca9 --- jjb/aai/aai-aai-common.yaml | 6 +++--- jjb/aai/aai-babel.yaml | 2 +- jjb/aai/aai-graphadmin.yaml | 2 +- jjb/aai/aai-graphgraph.yaml | 2 +- jjb/aai/aai-model-loader.yaml | 4 ++-- jjb/aai/aai-resources.yaml | 10 +++++----- jjb/aai/aai-schema-service.yaml | 2 +- jjb/aai/aai-sparky-be.yaml | 4 ++-- jjb/aai/aai-traversal.yaml | 8 ++++---- jjb/ccsdk/apps.yaml | 2 +- jjb/cli/cli.yaml | 6 +++--- jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml | 8 ++++---- jjb/dcaegen2/dcaegen2-collectors-datafile.yaml | 8 ++++---- jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 8 ++++---- jjb/dcaegen2/dcaegen2-collectors-restconf.yaml | 8 ++++---- 15 files changed, 40 insertions(+), 40 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' diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 9fb97a0c8..32b4e5053 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -106,7 +106,7 @@ # archive-artifacts: '' # docker-pom: 'pom.xml' # mvn-profile: docker -# build-node: ubuntu1804-docker-arm64-4c-2g +# build-node: ubuntu2004-docker-arm64-4c-2g - project: name: ccsdk-apps-info diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 3f1c3519c..6d35cc817 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -29,7 +29,7 @@ pom: 'deployment/docker/pom.xml' mvn-goals: 'docker:build' docker-image-name: 'onap/cli' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g project: 'cli' stream: - 'master': @@ -59,7 +59,7 @@ # mvn-settings: 'cli-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g +# build-node: ubuntu2004-docker-arm64-4c-2g # - project: name: cli-sonar @@ -113,7 +113,7 @@ sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g project: 'cli' project-name: 'cli' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 4599e94d6..da1d88235 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -10,7 +10,7 @@ - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g mvn-goals: 'clean deploy docker:build -DpushImage' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -37,7 +37,7 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g - project: name: dcaegen2-analytics-tca-gen2-sonar @@ -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: 'dcaegen2/analytics/tca-gen2' project-name: 'dcaegen2-analytics-tca-gen2' branch: 'master' @@ -67,7 +67,7 @@ - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: dcaegen2/analytics/tca-gen2 - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g project-name: 'dcaegen2-analytics-tca-gen2' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 510befec2..750b24aa9 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -16,7 +16,7 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' jobs: @@ -33,7 +33,7 @@ - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: - 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' mvn-goals: 'clean package docker:build -DpushImageTag' @@ -48,7 +48,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: 'dcaegen2/collectors/datafile' project-name: 'dcaegen2-collectors-datafile' branch: 'master' @@ -63,7 +63,7 @@ - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: dcaegen2/collectors/datafile - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g project-name: 'dcaegen2-collectors-datafile' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index bef9324fb..c071fb694 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -18,7 +18,7 @@ archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html' mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g jobs: - gerrit-maven-verify: pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh @@ -34,7 +34,7 @@ maven-versions-plugin: true mvn-goals: 'clean deploy -Ddocker.skip' - gerrit-maven-docker-stage: - 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' mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false' @@ -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: 'dcaegen2/collectors/hv-ves' project-name: 'dcaegen2-collectors-hv-ves' branch: 'master' @@ -69,7 +69,7 @@ stream: - 'master': branch: 'master' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g mvn-settings: 'dcaegen2-collectors-hv-ves-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 54e9b3f81..27f83c834 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -13,7 +13,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - 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' mvn-goals: 'clean package docker:build -DpushImageTag' @@ -35,7 +35,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' + build-node: 'ubuntu2004-docker-8c-8g' - project: name: dcaegen2-collectors-restconf-sonar @@ -48,7 +48,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: 'dcaegen2/collectors/restconf' project-name: 'dcaegen2-collectors-restconf' branch: 'master' @@ -63,7 +63,7 @@ - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: dcaegen2/collectors/restconf - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g project-name: 'dcaegen2-collectors-restconf' stream: - 'master': -- 2.16.6