diff options
130 files changed, 298 insertions, 297 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index c5f819466..f5f44f018 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -30,7 +30,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g java-version: openjdk8 - project: @@ -43,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' branch: 'master' @@ -59,7 +59,7 @@ jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' stream: @@ -88,7 +88,7 @@ - '{project-name}-{stream}-merge-docker' - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g java-version: openjdk8 - project: name: 'aai-aai-common-whitesource' project-name: 'aai-aai-common' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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 df9699e0c..b55d06a96 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -33,7 +33,7 @@ mvn-settings: 'aai-babel-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g java-version: openjdk11 mvn-version: 'mvn36' nexus-snapshot-repo: 'snapshots' @@ -49,7 +49,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/babel' project-name: 'aai-babel' branch: 'master' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index c009f1f2a..593a6aa47 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -33,7 +33,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g java-version: openjdk8 - project: @@ -46,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/graphadmin' project-name: 'aai-graphadmin' branch: 'master' diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 173ffe56b..dc9a63fdc 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/graphgraph' project-name: 'aai-graphgraph' branch: 'master' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index ef473182a..f211a2656 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -38,7 +38,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/logging-service' project-name: 'aai-logging-service' branch: 'master' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 4fd9f9495..cc3b665ea 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -33,7 +33,7 @@ mvn-settings: 'aai-model-loader-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-version: 'mvn36' java-version: openjdk11 nexus-snapshot-repo: 'snapshots' @@ -49,7 +49,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/model-loader' project-name: 'aai-model-loader' branch: 'master' @@ -87,7 +87,7 @@ - project: name: 'aai-model-loader-whitesource' project-name: 'aai-model-loader' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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 8b3d49ea3..b8eb752b0 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - '{project-name}-{stream}-merge-java': - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -37,7 +37,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g java-version: openjdk8 - project: @@ -50,7 +50,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-settings: 'aai-resources-settings' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index a26b6ec21..45bdd0aaa 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -38,7 +38,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/rest-client' project-name: 'aai-rest-client' branch: 'master' diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index b1ef066dc..663dc3b02 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -33,7 +33,7 @@ mvn-version: 'mvn36' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g java-version: openjdk11 - project: @@ -46,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g java-version: openjdk11 project: 'aai/schema-service' project-name: 'aai-schema-service' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index f06e57ed6..e86672f96 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -48,7 +48,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/sparky-be' project-name: 'aai-sparky-be' branch: 'master' @@ -86,7 +86,7 @@ - project: name: 'aai-sparky-be-whitesource' project-name: 'aai-sparky-be' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-settings: 'aai-sparky-be-settings' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index e25120ab5..0f0bd8dfc 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/sparky-fe' project-name: 'aai-sparky-fe' branch: 'master' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 9a7683911..1e8f38228 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - '{project-name}-{stream}-merge-java': - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -36,7 +36,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g java-version: openjdk8 - project: @@ -49,7 +49,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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 32b4e5053..399c1bca5 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -62,7 +62,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'ccsdk/apps' project-name: 'ccsdk-apps' branch: 'master' @@ -89,7 +89,7 @@ java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: ccsdk-apps-arm64-docker @@ -106,7 +106,7 @@ # archive-artifacts: '' # docker-pom: 'pom.xml' # mvn-profile: docker -# build-node: ubuntu2004-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g - project: name: ccsdk-apps-info diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 6d35cc817..bc9455641 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'cli' stream: - 'master': @@ -41,7 +41,7 @@ mvn-settings: 'cli-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: cli-arm64 @@ -59,7 +59,7 @@ # mvn-settings: 'cli-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu2004-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # - project: name: cli-sonar @@ -72,7 +72,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'cli' project-name: 'cli' branch: 'master' @@ -90,7 +90,7 @@ project-name: 'cli' branch: 'master' mvn-settings: 'cli-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: cli-info @@ -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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'cli' project-name: 'cli' branch: 'master' diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml index 6a42b61ff..e55444470 100644 --- a/jjb/cps/cps-csit.yaml +++ b/jjb/cps/cps-csit.yaml @@ -9,6 +9,7 @@ mvn-goals: clean install mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push=' project-name: 'cps' + build-node: ubuntu1804-docker-8c-8g recipients: 'toine.siebelink@est.tech' # project name in gerrit project: 'cps' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index da1d88235..4599e94d6 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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 750b24aa9..510befec2 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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 c071fb694..bef9324fb 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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 27f83c834..54e9b3f81 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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-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: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-collectors-restconf' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index a57466658..911be77a3 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'dcaegen2/collectors/snmptrap' project-name: 'dcaegen2-collectors-snmptrap' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 4346df269..b0d647072 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -46,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'dcaegen2/services/mapper' project-name: 'dcaegen2-services-mapper' branch: 'master' diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index d03176079..5af773983 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -40,7 +40,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'demo' project-name: 'demo' branch: 'master' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 7886d440d..b74439e86 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -57,7 +57,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'dmaap/buscontroller' project-name: 'dmaap-buscontroller' branch: 'master' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index d5e504bb5..530a7b2a7 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -52,7 +52,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'dmaap/datarouter' project-name: 'dmaap-datarouter' branch: 'master' diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index c77920091..34fe57b47 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -32,7 +32,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'dmaap/messagerouter/dmaapclient' project-name: 'dmaap-messagerouter-dmaapclient' branch: 'master' diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 442905828..a6796663c 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -54,7 +54,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'dmaap/messagerouter/messageservice' project-name: 'dmaap-messagerouter-messageservice' branch: 'master' diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 24ff69984..6bda3cba0 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -32,7 +32,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: externalapi-nbi-arm64 @@ -74,7 +74,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'externalapi/nbi' project-name: 'externalapi-nbi' branch: 'master' diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index f81e8c257..f28569896 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -41,7 +41,7 @@ # Timeout in minutes build-timeout: 90 - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g archive-artifacts: '' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index aa26a48f9..20e0f618c 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -33,7 +33,7 @@ mvn-settings: 'holmes-common-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g java-version: openjdk11 - project: @@ -46,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'holmes/common' project-name: 'holmes-common' branch: 'master' diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 1196d3931..1c49166bd 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -33,7 +33,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g java-version: openjdk11 - project: @@ -46,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'holmes/engine-management' project-name: 'holmes-engine-management' branch: 'master' diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 1b4f4e454..1177923ec 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -33,7 +33,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g java-version: openjdk11 - project: @@ -46,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'holmes/rule-management' project-name: 'holmes-rule-management' branch: 'master' diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml index a143963f0..f74b5b3aa 100644 --- a/jjb/integration/docker/integration-docker-onap-python.yaml +++ b/jjb/integration/docker/integration-docker-onap-python.yaml @@ -60,4 +60,4 @@ docker-build-args: '-f ./Dockerfile' docker-root: '$WORKSPACE' mvn-settings: 'integration-settings' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/integration/integration-data-provider.yaml b/jjb/integration/integration-data-provider.yaml index 1cb187e3b..3ec66f8c6 100644 --- a/jjb/integration/integration-data-provider.yaml +++ b/jjb/integration/integration-data-provider.yaml @@ -72,7 +72,7 @@ docker-name: 'onap/data-provider' docker-root: '$WORKSPACE' mvn-settings: 'integration-settings' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: integration-data-provider-release diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index 59b4f28fa..8a4cf0d85 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -43,7 +43,7 @@ # To simplify the references inside tox.ini and tests/settings.py docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest tox - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g build-timeout: 20 jobs: - gerrit-docker-verify diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index 94e40d328..95d8fb36d 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -4,7 +4,7 @@ disabled: '{disabled}' project-type: freestyle - build-node: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' node: '{build-node}' recipients: '' java-version: 'openjdk11' @@ -67,7 +67,7 @@ disabled: '{disabled}' project-type: freestyle - build-node: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' node: '{build-node}' recipients: '' java-version: 'openjdk11' @@ -139,7 +139,7 @@ branch: master build-concurrent: false build-days-to-keep: 30 # 30 days in case a release takes long to get approved. - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g build-timeout: 60 container-public-registry: 'nexus3.onap.org:10001' git-url: "$GIT_URL/$PROJECT" diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml index 6a1aa3b7c..a0fafde4e 100644 --- a/jjb/integration/integration-templates-docker.yaml +++ b/jjb/integration/integration-templates-docker.yaml @@ -3,7 +3,7 @@ name: '{project-name}-{stream}-{subproject}-docker-merge' id: integration-docker-merge project-type: freestyle - node: 'ubuntu2004-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' docker-image-name: '' mvn-goals: 'clean package docker:build docker:push' @@ -65,7 +65,7 @@ name: '{project-name}-{stream}-{subproject}-docker-verify' id: integration-docker-verify project-type: freestyle - node: 'ubuntu2004-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' docker-image-name: '' mvn-goals: 'clean package docker:build' post-docker-verify-script: '' @@ -130,7 +130,7 @@ id: integration-docker-compose-verify project-type: freestyle description: 'This job validates Docker Compose based projects' - node: 'ubuntu2004-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' docker_root: '$WORKSPACE' post_script: '' netconf_sim_service_name: '' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index c70712dbd..77be42b97 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -8,7 +8,7 @@ name: '{project-name}-{stream}-verify-vagrantfile' project-type: freestyle description: 'Job intended for validating vagrantfiles' - node: ubuntu2004-builder-4c-4g + node: ubuntu1804-builder-4c-4g parameters: - lf-infra-parameters: @@ -57,7 +57,7 @@ id: integration-linters project-type: freestyle description: 'Job intended for running linters with Tox and Coala' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g node: '{build-node}' parameters: diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 047b81cad..cb8286d8a 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -22,7 +22,7 @@ - 'master': branch: 'master' mvn-settings: 'integration-settings' - build-node: 'ubuntu2004-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'test-vcpe': path: 'test/vcpe' @@ -56,7 +56,7 @@ - 'test-security-k8s': path: 'test/security/k8s' pattern: '{path}/**' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g script: | #!/bin/bash set -ex # Fail build if any setup step fails @@ -65,7 +65,7 @@ - 'test-security-sslendpoints': path: 'test/security/sslendpoints' pattern: '{path}/**' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g script: | #!/bin/bash set -ex # Fail build if any setup step fails diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml index 873371aaf..ed7c32e2b 100644 --- a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml +++ b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml @@ -17,7 +17,7 @@ branch: 'master' mvn-settings: 'integration-simulators-5G-core-nf-simulator-settings' archive-artifacts: '' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g subproject: - 'AMF': path: 'coresim/AMF/' diff --git a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml index c34dd84a6..17d3d9be2 100644 --- a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml +++ b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml @@ -19,7 +19,7 @@ mvn-settings: 'integration-simulators-A1-policy-enforcement-simulator-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml index 624373c63..73a604b40 100644 --- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml +++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml @@ -19,7 +19,7 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index d9fd63f8f..feae0d44a 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -12,7 +12,7 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true' @@ -26,7 +26,7 @@ maven-versions-plugin: true mvn-goals: 'clean deploy' - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' @@ -42,7 +42,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: integration/simulators/pnf-simulator project-name: integration-pnf-simulator branch: 'master' diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index 0c1c736c7..2c8584c26 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -10,7 +10,7 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml index 9589354f3..ac0c0649f 100644 --- a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml @@ -11,7 +11,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean install -P docker -DskipDockerPush=false' @@ -30,7 +30,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' - project: name: integration-simulators-nf-simulator-pm-https-server-sonar @@ -43,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'integration/simulators/nf-simulator/pm-https-server' project-name: 'integration-simulators-nf-simulator-pm-https-server' branch: 'master' diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml index f5ea55c9e..4caba8286 100644 --- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml @@ -11,7 +11,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean deploy -P docker -DskipDockerPush=false' @@ -30,7 +30,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' - project: name: integration-simulators-nf-simulator-avcn-manager-sonar @@ -43,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'integration/simulators/nf-simulator/avcn-manager' project-name: 'integration-simulators-nf-simulator-avcn-manager' branch: 'master' diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml index c43353212..a3345c8cc 100644 --- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml @@ -12,7 +12,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean install -P docker -DskipDockerPush=false' @@ -31,7 +31,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' - project: name: integration-simulators-nf-simulator-netconf-server-sonar @@ -43,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'integration/simulators/nf-simulator/netconf-server' project-name: 'integration-simulators-nf-simulator-netconf-server' branch: 'master' diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml index 6d6296b6d..e26074597 100644 --- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml @@ -14,7 +14,7 @@ - 'master': branch: 'master' mvn-settings: 'integration-simulators-nf-simulator-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' @@ -23,7 +23,7 @@ jobs: - gerrit-tox-sonar cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'integration/simulators/nf-simulator' project-name: 'integration-simulators-nf-simulator' branch: 'master' diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml index f18a9bcb0..299457328 100644 --- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml @@ -11,7 +11,7 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean deploy -P docker -DskipDockerPush=false' @@ -30,7 +30,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' - project: name: integration-simulators-nf-simulator-ves-client-sonar @@ -43,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'integration/simulators/nf-simulator/ves-client' project-name: 'integration-simulators-nf-simulator-ves-client' branch: 'master' diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml index b346dad0c..234d1fc86 100644 --- a/jjb/lab/lab-templates.yaml +++ b/jjb/lab/lab-templates.yaml @@ -4,7 +4,7 @@ description: '{job-desc}' disabled: false project-type: freestyle - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g properties: - lf-infra-properties: diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml index e8b983815..72115a4ae 100644 --- a/jjb/modeling/modeling-etsicatalog.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -32,7 +32,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: modeling-etsicatalog-sonar @@ -44,7 +44,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'modeling/etsicatalog' project-name: 'modeling-etsicatalog' branch: 'master' diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 0c83f05d3..b2d8beda3 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -33,7 +33,7 @@ mvn-settings: 'msb-apigateway-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: msb-apigateway-arm64 @@ -64,7 +64,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'msb/apigateway' project-name: 'msb-apigateway' branch: 'master' diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 5d5de9ae7..72fab4ccc 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -27,7 +27,7 @@ mvn-settings: 'msb-discovery-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: msb-discovery-arm64 @@ -57,7 +57,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'msb/discovery' project-name: 'msb-discovery' branch: 'master' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index c9d8d74c1..5c599c32a 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -18,7 +18,7 @@ mvn-settings: 'msb-java-sdk-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: msb-java-sdk-sonar @@ -30,7 +30,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'msb/java-sdk' project-name: 'msb-java-sdk' branch: 'master' diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 1f78d0f28..00ac8a1e8 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -18,7 +18,7 @@ mvn-settings: 'msb-swagger-sdk-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: msb-swagger-sdk-sonar @@ -30,7 +30,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'msb/swagger-sdk' project-name: 'msb-swagger-sdk' branch: 'master' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 5ba682ad0..988d38387 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -38,7 +38,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: multicloud-framework-arm64-java @@ -72,7 +72,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/framework' project-name: 'multicloud-framework-multivimbroker' branch: 'master' @@ -106,7 +106,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/framework' project-name: 'multicloud-framework-artifactbroker' branch: 'master' diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml index 1b07c89bb..113bce7e9 100644 --- a/jjb/multicloud/multicloud-framework-python.yaml +++ b/jjb/multicloud/multicloud-framework-python.yaml @@ -9,7 +9,7 @@ - 'guilin': branch: 'guilin' mvn-settings: 'multicloud-framework-settings' - build-node: 'ubuntu2004-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'multivimbroker': path: 'multivimbroker' diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 042032003..428535a0f 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -35,7 +35,7 @@ disable-kud: false files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: multicloud-k8s-arm64 diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 7c848a72c..686a8d69b 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -31,7 +31,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g disabled: true #- project: @@ -66,7 +66,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack/vmware' project-name: 'multicloud-openstack-vmware' branch: 'master' @@ -82,7 +82,7 @@ nexus-iq-namespace: 'onap-' project: multicloud/openstack/vmware project-name: 'multicloud-openstack-vmware' - build-node: 'ubuntu2004-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' stream: - 'master': branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml index 19981613d..45cccb121 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-python.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-python.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' mvn-settings: 'multicloud-openstack-vmware-settings' - build-node: 'ubuntu2004-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'vio': path: 'vio' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 60060fd6c..f78ca6d7e 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -106,7 +106,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-windriver' branch: 'master' @@ -125,7 +125,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-pike' branch: 'master' @@ -144,7 +144,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-starlingx' branch: 'master' @@ -178,7 +178,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-fcaps' branch: 'master' @@ -197,7 +197,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' # cron: '@daily' -# build-node: ubuntu2004-builder-4c-4g +# build-node: ubuntu1804-builder-4c-4g # project: 'multicloud/openstack' # project-name: 'multicloud-openstack-lenovo' # branch: 'master' @@ -216,7 +216,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-hpa' branch: 'master' diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml index 2d1351687..0985d66c2 100644 --- a/jjb/music/music-distributed-kv-store.yaml +++ b/jjb/music/music-distributed-kv-store.yaml @@ -17,7 +17,7 @@ mvn-settings: 'music-distributed-kv-store-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: music-distributed-kv-store-info diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml index 8b6b86755..1450e9c16 100644 --- a/jjb/music/music-jar.yaml +++ b/jjb/music/music-jar.yaml @@ -27,7 +27,7 @@ mvn-settings: 'music-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 94623c229..93fabe716 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -26,7 +26,7 @@ mvn-settings: 'oom-registrator-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: oom-registrator-clm diff --git a/jjb/oom/oom-templates.yaml b/jjb/oom/oom-templates.yaml index a82cf343e..3134bef03 100644 --- a/jjb/oom/oom-templates.yaml +++ b/jjb/oom/oom-templates.yaml @@ -12,7 +12,7 @@ id: oom-linters project-type: freestyle description: 'Job intended for running linters with Tox and Coala' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g node: '{build-node}' parameters: diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 12acb6186..513b73c4d 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -28,7 +28,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: oparent-clm diff --git a/jjb/openci/openci-onap-daily-jobs.yaml b/jjb/openci/openci-onap-daily-jobs.yaml index b02699eda..03b9be801 100644 --- a/jjb/openci/openci-onap-daily-jobs.yaml +++ b/jjb/openci/openci-onap-daily-jobs.yaml @@ -25,7 +25,7 @@ concurrent: false - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g parameters: - string: @@ -71,7 +71,7 @@ concurrent: false - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g triggers: - jms-messaging: diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 970965d93..cb524824a 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -16,7 +16,7 @@ pom: 'pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python': - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - '{project-name}-{stream}-{subproject}-merge-java': build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: @@ -35,7 +35,7 @@ files: '**' archive-artifacts: '' - build-node: 'ubuntu2004-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' - project: name: optf-has-sonar diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 18865fb75..0022aff27 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -17,7 +17,7 @@ pom: 'pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python': - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - '{project-name}-{stream}-{subproject}-merge-java': build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: @@ -36,7 +36,7 @@ files: '**' archive-artifacts: '' - build-node: 'ubuntu2004-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' - project: name: optf-osdf-sonar diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index bacce4af7..54c6a5c77 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -54,7 +54,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/apex-pdp' project-name: 'policy-apex-pdp' branch: 'master' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 1e2742404..0378b893a 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -36,7 +36,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-api-sonar @@ -48,7 +48,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/api' project-name: 'policy-api' branch: 'master' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index b8e3d3ecc..9b9069890 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -27,7 +27,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-common-sonar @@ -39,7 +39,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/common' project-name: 'policy-common' branch: 'master' diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 46110b40c..53404fd5c 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -36,7 +36,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-distribution-sonar @@ -48,7 +48,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/distribution' project-name: 'policy-distribution' branch: 'master' diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index acbd37eb3..74c90118b 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -36,7 +36,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-docker-clm diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index ae3204e2a..7cbce5688 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -49,7 +49,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/drools-applications' project-name: 'policy-drools-applications' branch: 'master' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index ccb8760ad..6153fe91a 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -48,7 +48,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/drools-pdp' project-name: 'policy-drools-pdp' branch: 'master' diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index eb901d88c..f7306937d 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -34,7 +34,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-gui-sonar @@ -46,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/gui' project-name: 'policy-gui' branch: 'master' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index b32905da4..7bfdc8f8e 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -36,7 +36,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-models-sonar @@ -48,7 +48,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/models' project-name: 'policy-models' branch: 'master' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index cadb818f7..f0e647338 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -36,7 +36,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-pap-sonar @@ -48,7 +48,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/pap' project-name: 'policy-pap' branch: 'master' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 5efff5347..bf54cd098 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -27,7 +27,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-parent-clm diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 269dd5e6a..cdddf2f22 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -36,7 +36,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-xacml-pdp-sonar @@ -48,7 +48,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/xacml-pdp' project-name: 'policy-xacml-pdp' branch: 'master' diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml index d76cde04a..e720f3211 100644 --- a/jjb/sdc/sdc-onap-ui-angular.yaml +++ b/jjb/sdc/sdc-onap-ui-angular.yaml @@ -42,7 +42,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/onap-ui-angular' project-name: 'sdc-onap-ui-angular' branch: 'master' diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml index 798a64410..ab23a6737 100644 --- a/jjb/sdc/sdc-onap-ui-common.yaml +++ b/jjb/sdc/sdc-onap-ui-common.yaml @@ -36,7 +36,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/onap-ui-common' project-name: 'sdc-onap-ui-common' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml index 647edd1d7..d365db5a5 100644 --- a/jjb/sdc/sdc-sdc-be-common.yaml +++ b/jjb/sdc/sdc-sdc-be-common.yaml @@ -39,7 +39,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-be-common' project-name: 'sdc-sdc-be-common' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 28f4083d2..32d9507fb 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -37,7 +37,7 @@ java-version: openjdk11 jobs: - '{project-name}-{stream}-integration-pairwise' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'sdc/sdc-distribution-client' project-name: 'sdc-sdc-distribution-client' stream: @@ -61,7 +61,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-distribution-client' project-name: 'sdc-sdc-distribution-client' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index bad80838e..5857c1c84 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -5,14 +5,14 @@ project-name: 'sdc-sdc-docker-base' jobs: - '{project-name}-{stream}-verify-java': - build-node: 'ubuntu2004-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' docker-pom: 'pom.xml' - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'default' - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P default' container-public-registry: 'nexus3.onap.org:10001' @@ -28,7 +28,7 @@ mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g maven-version: 'mvn36' - project: diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml index 7bbf0307b..39010d320 100644 --- a/jjb/sdc/sdc-sdc-helm-validator.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator.yaml @@ -26,7 +26,7 @@ maven-versions-plugin: true mvn-goals: 'clean deploy' - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean install docker:build docker:push' container-public-registry: 'nexus3.onap.org:10001' @@ -40,7 +40,7 @@ branch: 'master' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: @@ -54,7 +54,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'sdc/sdc-helm-validator' project-name: 'sdc-sdc-helm-validator' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index ae780562a..1cf4aad13 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -36,7 +36,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-pubsub' project-name: 'sdc-sdc-pubsub' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index b4c4f8761..9b0c252b7 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -42,7 +42,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-tosca' project-name: 'sdc-sdc-tosca' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index d35635a84..e4eff9dec 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -17,7 +17,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -37,7 +37,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g maven-version: 'mvn36' - project: @@ -50,7 +50,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-workflow-designer' project-name: 'sdc-sdc-workflow-designer' branch: 'master' @@ -67,7 +67,7 @@ nexus-iq-namespace: 'onap-' project: sdc/sdc-workflow-designer project-name: 'sdc-sdc-workflow-designer' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 621eac890..46b4b79ea 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -30,9 +30,9 @@ - '{project-name}-{stream}-verify-java': # this build is unit test only (Verify 1/2) mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - build-node: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu2004-docker-8c-16g' + build-node: 'ubuntu1804-docker-8c-16g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator' @@ -53,7 +53,7 @@ maven-versions-plugin: true mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' mvn-version: 'mvn36' @@ -73,7 +73,7 @@ mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-version: 'mvn36' - project: @@ -87,7 +87,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-16g + build-node: ubuntu1804-docker-8c-16g project: 'sdc' project-name: 'sdc' branch: 'master' @@ -108,7 +108,7 @@ nexus-iq-namespace: 'onap-' project: sdc project-name: 'sdc' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g stream: - 'master': branch: 'master' @@ -130,7 +130,7 @@ - project: name: 'sdc-whitesource' project-name: 'sdc' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - gerrit-whitesource-scan: build-timeout: 120 diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 135973e05..732771735 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -10,7 +10,7 @@ project-name: 'sdnc-apps' jobs: - gerrit-maven-verify: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Ddocker.skip.push=true -Pdocker' @@ -24,7 +24,7 @@ cron: '' sbom-generator: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -Pdocker' @@ -53,7 +53,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn38" - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -67,7 +67,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdnc/apps' project-name: 'sdnc-apps' branch: 'master' @@ -94,7 +94,7 @@ # mvn-settings: 'sdnc-apps-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu2004-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g - project: name: sdnc-apps-clm @@ -103,7 +103,7 @@ nexus-iq-namespace: 'onap-' project: sdnc/apps project-name: 'sdnc-apps' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index d472d95ec..6c834a01d 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -34,7 +34,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn38" - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -48,7 +48,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdnc/northbound' project-name: 'sdnc-northbound' branch: 'master' @@ -65,7 +65,7 @@ nexus-iq-namespace: 'onap-' project: sdnc/northbound project-name: 'sdnc-northbound' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 574974006..e09e3ec8b 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -15,7 +15,7 @@ cron: '' sbom-generator: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker' @@ -36,7 +36,7 @@ mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g shallow-clone: true mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -57,7 +57,7 @@ # mvn-settings: 'sdnc-oam-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu2004-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g - project: name: sdnc-oam-clm @@ -66,7 +66,7 @@ nexus-iq-namespace: 'onap-' project: sdnc/oam project-name: 'sdnc-oam' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml index f46cc4d3b..e0f1fa141 100644 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-cnf-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-adapters-so-cnf-adapter-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g project: 'so/adapters/so-cnf-adapter' project-name: 'so-adapters-so-cnf-adapter' branch: 'master' diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index 1c4e5b1c7..86f3f21a6 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-adapters-so-etsi-sol003-adapter-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g project: 'so/adapters/so-etsi-sol003-adapter' project-name: 'so-adapters-so-etsi-sol003-adapter' branch: 'master' @@ -72,7 +72,7 @@ nexus-iq-namespace: 'onap-' project: 'so/adapters/so-etsi-sol003-adapter' project-name: 'so-adapters-so-etsi-sol003-adapter' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index 398852ff2..2d1a8d545 100644 --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-adapters-so-etsi-sol005-adapter-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g project: 'so/adapters/so-etsi-sol005-adapter' project-name: 'so-adapters-so-etsi-sol005-adapter' branch: 'master' diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index 88b6eeca9..d230d005e 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -45,7 +45,7 @@ mvn-settings: 'so-adapters-so-nssmf-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-adapters-so-nssmf-adapter-sonar @@ -59,7 +59,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g project: 'so/adapters/so-nssmf-adapter' project-name: 'so-adapters-so-nssmf-adapter' branch: 'master' diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml index 2fbec6a08..2138fcf9a 100644 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-oof-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-adapters-so-oof-adapter-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g project: 'so/adapters/so-oof-adapter' project-name: 'so-adapters-so-oof-adapter' branch: 'master' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index e0f23ce33..984647542 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -39,7 +39,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'so/libs' project-name: 'so-libs' java-version: openjdk11 diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml index ab625623f..7e5614400 100644 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-so-admin-cockpit-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-so-admin-cockpit-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g project: 'so/so-admin-cockpit' project-name: 'so-so-admin-cockpit' branch: 'master' @@ -70,7 +70,7 @@ jobs: - 'onap-gerrit-maven-coverity' cron: '@daily' - build-node: 'ubuntu2004-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' project: 'so/so-admin-cockpit' project-name: 'so-so-admin-cockpit' branch: 'master' @@ -101,7 +101,7 @@ nexus-iq-namespace: 'onap-' project: 'so/so-admin-cockpit' project-name: 'so-so-admin-cockpit' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml index ee6b43fce..5a54d934a 100644 --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-so-etsi-nfvo-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-so-etsi-nfvo-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g project: 'so/so-etsi-nfvo' project-name: 'so-so-etsi-nfvo' branch: 'master' @@ -72,7 +72,7 @@ nexus-iq-namespace: 'onap-' project: 'so/so-etsi-nfvo' project-name: 'so-so-etsi-nfvo' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 716bd6559..510e10879 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -17,7 +17,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -38,7 +38,7 @@ mvn-settings: 'so-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-sonar @@ -52,7 +52,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g project: 'so' project-name: 'so' branch: 'master' @@ -66,7 +66,7 @@ jobs: - 'onap-gerrit-maven-coverity' cron: '@daily' - build-node: 'ubuntu2004-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' project: 'so' project-name: 'so' branch: 'master' @@ -97,7 +97,7 @@ nexus-iq-namespace: 'onap-' project: so project-name: 'so' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index 8d2617772..e4983fdc2 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -17,7 +17,7 @@ mvn-settings: 'testsuite-python-testing-utils-settings' files: '**' archive-artifacts: '' - build-node: 'ubuntu2004-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' - project: name: testsuite-python-testing-utils-verify @@ -27,7 +27,7 @@ - 'master': branch: 'master' mvn-settings: 'testsuite-python-testing-utils-settings' - build-node: 'ubuntu2004-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'robotframework-onap': path: 'robotframework-onap' @@ -40,6 +40,6 @@ project-name: testsuite-python-testing-utils jobs: - gerrit-info-yaml-verify - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: testsuite/python-testing-utils branch: master diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml index a991233e8..1a10bf10c 100644 --- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml +++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml @@ -26,7 +26,7 @@ files: '**' archive-artifacts: '' docker-pom: 'pom.xml' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: usecase-ui-intent-analysis-sonar @@ -38,7 +38,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'usecase-ui/intent-analysis' project-name: 'usecase-ui-intent-analysis' branch: 'master' @@ -54,7 +54,7 @@ nexus-iq-namespace: 'onap-' project: usecase-ui/intent-analysis project-name: 'usecase-ui-intent-analysis' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml index 079148786..bb984aebb 100644 --- a/jjb/usecaseui/usecase-ui-nlp.yaml +++ b/jjb/usecaseui/usecase-ui-nlp.yaml @@ -24,7 +24,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: usecase-ui-nlp-sonar @@ -36,7 +36,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'usecase-ui/nlp' project-name: 'usecase-ui-nlp' branch: 'master' @@ -51,7 +51,7 @@ nexus-iq-namespace: 'onap-' project: usecase-ui/nlp project-name: 'usecase-ui-nlp' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-nlp-settings' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 213710b02..a4241e71f 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -24,7 +24,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: usecase-ui-server-sonar @@ -36,7 +36,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'usecase-ui/server' project-name: 'usecase-ui-server' branch: 'master' @@ -51,7 +51,7 @@ nexus-iq-namespace: 'onap-' project: usecase-ui/server project-name: 'usecase-ui-server' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-server-settings' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index da75aff9d..4965f82c7 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -29,7 +29,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: usecase-ui-clm @@ -38,7 +38,7 @@ nexus-iq-namespace: 'onap-' project: usecase-ui project-name: 'usecase-ui' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-settings' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index ded6cb7a4..589a7adc2 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -47,7 +47,7 @@ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' mvn-params: '-f lcm/pom.xml' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vfc/gvnfm/vnflcm' project-name: 'vfc-gvnfm-vnflcm-lcm' branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml index 7ef2f8420..797e0a0d6 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml @@ -8,7 +8,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-gvnfm-vnflcm-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g subproject: - 'lcm': path: 'lcm' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index d4760b1e5..1445f9b78 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -28,7 +28,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vfc-gvnfm-vnfmgr-mgr-sonar @@ -41,7 +41,7 @@ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' mvn-params: '-f mgr/pom.xml' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vfc/gvnfm/vnfmgr' project-name: 'vfc-gvnfm-vnfmgr-mgr' branch: 'master' @@ -56,7 +56,7 @@ nexus-iq-namespace: 'onap-' project: vfc/gvnfm/vnfmgr project-name: 'vfc-gvnfm-vnfmgr' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vfc-gvnfm-vnfmgr-settings' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml index c99f1e3c7..2bb891beb 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml @@ -8,7 +8,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-gvnfm-vnfmgr-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g subproject: - 'mgr': path: 'mgr' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 290a533e0..6551d45d9 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -29,7 +29,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vfc-gvnfm-vnfres-res-sonar @@ -42,7 +42,7 @@ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' mvn-params: '-f res/pom.xml' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vfc/gvnfm/vnfres' project-name: 'vfc-gvnfm-vnfres-res' branch: 'master' @@ -57,7 +57,7 @@ nexus-iq-namespace: 'onap-' project: vfc/gvnfm/vnfres project-name: 'vfc-gvnfm-vnfres' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vfc-gvnfm-vnfres-settings' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml index c98fc0939..5bdf8e411 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml @@ -8,7 +8,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-gvnfm-vnfres-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g subproject: - 'res': path: 'res' diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 5a6a3c941..679cc45e3 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -7,7 +7,7 @@ stream: - 'master': branch: 'master' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 8af1b6e5d..1db7b6777 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -25,7 +25,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vfc-nfvo-driver-svnfm-huawei-sonar @@ -38,7 +38,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-params: '-f huawei/pom.xml' project: 'vfc/nfvo/driver/vnfm/svnfm' project-name: 'vfc-nfvo-driver-svnfm-huawei' @@ -56,7 +56,7 @@ nexus-iq-namespace: 'onap-' project: vfc/nfvo/driver/vnfm/svnfm project-name: 'vfc-nfvo-driver-svnfm-huawei' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 77e955b52..db89affc4 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -31,7 +31,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar @@ -44,7 +44,7 @@ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' mvn-params: '-f gvnfmadapter/pom.xml' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vfc/nfvo/driver/vnfm/gvnfm' project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter' branch: 'master' @@ -59,7 +59,7 @@ nexus-iq-namespace: 'onap-' project: vfc/nfvo/driver/vnfm/gvnfm project-name: 'vfc-nfvo-driver-vnfm-gvnfm' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml index 860d60934..0cad04b23 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml @@ -8,7 +8,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g subproject: - 'gvnfmadapter': path: 'gvnfmadapter' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml index 2424119f9..ac6138a0e 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml @@ -17,5 +17,5 @@ build-node: ubuntu1804-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml index 599252b10..52aee732c 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml @@ -21,7 +21,7 @@ maven-versions-plugin: true mvn-params: '-P rootOnly' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vfc-nfvo-driver-svnfm-root-info diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml index 4651b445e..db2b6bb8b 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -24,7 +24,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar @@ -37,7 +37,7 @@ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' mvn-params: '-f zte/vmanager/pom.xml' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vfc/nfvo/driver/vnfm/svnfm' project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte' branch: 'master' @@ -53,6 +53,6 @@ nexus-iq-namespace: 'onap-' project: vfc/nfvo/driver/vnfm/svnfm project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml index 15a9025bd..5c77ac299 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g subproject: - 'drv-vnfm-zte': path: 'zte/vmanager' diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index ddc4574cc..89726b48c 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -36,7 +36,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vfc/nfvo/lcm' project-name: 'vfc-nfvo-lcm' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml index f15dc6397..19791ef28 100644 --- a/jjb/vfc/vfc-nfvo-lcm-python.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-nfvo-lcm-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g subproject: - 'lcm': path: '.' diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 22b9d28d5..49c7c019d 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -21,7 +21,7 @@ - 'master': branch: 'master' mvn-settings: 'vnfsdk-dovetail-integration-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-merge-java' @@ -56,7 +56,7 @@ jobs: - gerrit-tox-sonar cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vnfsdk/dovetail-integration' project-name: 'vnfsdk-dovetail-integration' branch: 'master' @@ -80,7 +80,7 @@ nexus-iq-namespace: 'onap-' project: vnfsdk/dovetail-integration project-name: 'vnfsdk-dovetail-integration' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index 9bc1c346c..19c88c39b 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -17,7 +17,7 @@ mvn-settings: 'vnfsdk-functest-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vnfsdk-functest-info @@ -35,7 +35,7 @@ nexus-iq-namespace: 'onap-' project: vnfsdk/functest project-name: 'vnfsdk-functest' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml index 26e33e40a..6d22310e6 100644 --- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml +++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml @@ -14,7 +14,7 @@ - 'master': branch: 'master' mvn-settings: 'vnfsdk-pkgtools-settings' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{subproject}-python-staging-{stream}' @@ -25,7 +25,7 @@ jobs: - gerrit-tox-sonar cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vnfsdk/pkgtools' project-name: 'vnfsdk-pkgtools' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index a9d2819a7..519c4471f 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -28,7 +28,7 @@ mvn-settings: 'vnfsdk-refrepo-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vnfsdk-refrepo-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vnfsdk/refrepo' project-name: 'vnfsdk-refrepo' branch: 'master' @@ -66,7 +66,7 @@ nexus-iq-namespace: 'onap-' project: vnfsdk/refrepo project-name: 'vnfsdk-refrepo' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 46e09f485..4364220f5 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -22,7 +22,7 @@ mvn-settings: 'vnfsdk-validation-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vnfsdk-validation-sonar @@ -35,7 +35,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vnfsdk/validation' project-name: 'vnfsdk-validation' branch: 'master' @@ -60,7 +60,7 @@ nexus-iq-namespace: 'onap-' project: vnfsdk/validation project-name: 'vnfsdk-validation' - build-node: ubuntu2004-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml index 75c754f86..36a51fc34 100644 --- a/jjb/vvp/vvp-test-engine.yaml +++ b/jjb/vvp/vvp-test-engine.yaml @@ -19,7 +19,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'vvp/test-engine' project-name: 'vvp-test-engine' branch: 'master' diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index 6480ab2f8..9f9b85e10 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -12,7 +12,7 @@ path: '.' pattern: '**' mvn-settings: 'vvp-validation-scripts-settings' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily': @@ -32,7 +32,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'vvp/validation-scripts' project-name: 'vvp-validation-scripts' branch: 'master' @@ -44,7 +44,7 @@ name: vvp-validation-scripts-tracability-matrix project: 'vvp/validation-scripts' project-name: 'vvp-validation-scripts' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-settings: 'vvp-validation-scripts-settings' mvn-global-settings: 'global-settings' stream: |