From: Jessica Wagantall Date: Wed, 28 Sep 2022 18:00:52 +0000 (+0000) Subject: Merge "Chore: Move to ubuntu2004-builder" X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=2f42ab9471e3cc478dd6eccd9b9dbce4ca9b15fe;hp=6d7512524ac903f51a2df5ae240f9df2b87366d3 Merge "Chore: Move to ubuntu2004-builder" --- diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index f0c363411..4599e94d6 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -74,8 +72,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' mvn-version: 'mvn35' maven-version: 'mvn35' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 3bac9d475..510befec2 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -70,8 +68,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' java-version: openjdk11 mvn-settings: 'dcaegen2-collectors-datafile-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index 35d4eea3a..bef9324fb 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' # apply to all jobs @@ -71,8 +69,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' 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 61e8b02d5..54e9b3f81 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -23,8 +23,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-snapshot-id: 'ecomp-snapshots' @@ -70,8 +68,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-collectors-restconf-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 56708fe18..a57466658 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index ded870e03..1e551bfd5 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -26,8 +26,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-collectors-ves-settings' @@ -74,8 +72,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-collectors-ves-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 4f9d4268f..7adbfdd48 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -96,8 +96,6 @@ stream: - master: branch: master - - istanbul: - branch: istanbul - jakarta: branch: jakarta diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml index fcc9ca646..3d43a02ed 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: dcaegen2-platform-settings @@ -49,6 +47,4 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index 61e8034f9..bbc237faf 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: dcaegen2-platform-settings @@ -68,7 +66,5 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml index 43b6019ce..7de568b18 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -71,6 +69,4 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml index a102bc509..57b3ed5b7 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml @@ -72,6 +72,4 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index 3bdb7393f..65dc423f6 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -24,8 +24,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings' @@ -71,8 +69,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 1c6ca0df2..691d54f38 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -10,8 +10,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -53,8 +51,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -90,8 +86,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -127,8 +121,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index 3f37a13a1..6947e123f 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -78,8 +78,8 @@ DNAME={container-snapshot-registry}/{docker-name} docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2 docker push $DNAME:$DOCKER_IMAGE_TAG2 - stream: istanbul - branch: istanbul + stream: jakarta + branch: jakarta cron: '' - gerrit-whitesource-scan: build-timeout: 120 @@ -108,8 +108,6 @@ stream: - master: branch: master - - istanbul: - branch: istanbul - jakarta: branch: jakarta views: diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index 9e33b8113..7ac291829 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -12,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-services-heartbeat-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml index b6eefe398..103e77dbd 100644 --- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml @@ -10,8 +10,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -97,6 +95,4 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index e6bbdbeb2..4346df269 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -24,8 +24,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-services-mapper-settings' @@ -48,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g project: 'dcaegen2/services/mapper' project-name: 'dcaegen2-services-mapper' branch: 'master' @@ -68,8 +66,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-services-mapper-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 5a0e814a0..d42888b76 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -70,8 +68,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' java-version: openjdk11 mvn-settings: 'dcaegen2-services-pm-mapper-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 08078e8b3..8efc860c1 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -22,8 +22,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -67,8 +65,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-services-prh-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 7c63d1945..10fa2c24a 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -78,8 +76,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-services-sdk-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml index 212a06107..5023f77e9 100644 --- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -10,8 +10,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -98,6 +96,4 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index d2eb8ee2c..4f751c50e 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -22,8 +22,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -67,8 +65,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-services-son-handler-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 61e9ab727..4cecd41da 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-utils-settings' diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 46c501ef6..e47a14594 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -19,8 +19,6 @@ branch: 'master' - 'jakarta': branch: 'jakarta' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 5af773983..d03176079 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 b74439e86..7886d440d 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 530a7b2a7..d5e504bb5 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 34fe57b47..c77920091 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 a6796663c..442905828 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 6bda3cba0..24ff69984 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 f28569896..f81e8c257 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -41,7 +41,7 @@ # Timeout in minutes build-timeout: 90 - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g archive-artifacts: '' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index bccc8ce22..aa26a48f9 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -16,6 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true java-version: openjdk11 + sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g java-version: openjdk11 @@ -32,7 +33,7 @@ mvn-settings: 'holmes-common-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g java-version: openjdk11 - project: @@ -45,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 79d9e984e..1196d3931 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -10,6 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true java-version: openjdk11 + sbom-generator: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g @@ -32,7 +33,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g java-version: openjdk11 - project: @@ -45,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 e93c94c94..1b4f4e454 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -10,6 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true java-version: openjdk11 + sbom-generator: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g @@ -32,7 +33,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g java-version: openjdk11 - project: @@ -45,7 +46,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g project: 'holmes/rule-management' project-name: 'holmes-rule-management' branch: 'master' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 77be42b97..c70712dbd 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: ubuntu1804-builder-4c-4g + node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g node: '{build-node}' parameters: diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index cb8286d8a..918e1a60f 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -22,7 +22,7 @@ - 'master': branch: 'master' mvn-settings: 'integration-settings' - build-node: 'ubuntu1804-builder-4c-4g' + build-node: 'ubuntu2004-builder-4c-4g' subproject: - 'test-vcpe': path: 'test/vcpe' @@ -56,7 +56,7 @@ - 'test-security-k8s': path: 'test/security/k8s' pattern: '{path}/**' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g script: | #!/bin/bash set -ex # Fail build if any setup step fails 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 e26074597..6d6296b6d 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' @@ -23,7 +23,7 @@ jobs: - gerrit-tox-sonar cron: '@daily' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g project: 'integration/simulators/nf-simulator' project-name: 'integration-simulators-nf-simulator' branch: 'master' diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml index 234d1fc86..b346dad0c 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g properties: - lf-infra-properties: diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml index 8dead6dff..cdd9cdc21 100644 --- a/jjb/modeling/modeling-etsicatalog.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -30,7 +30,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g - project: name: modeling-etsicatalog-sonar @@ -42,7 +42,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 b2d8beda3..0c83f05d3 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 72fab4ccc..5d5de9ae7 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 5c599c32a..c9d8d74c1 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 00ac8a1e8..1f78d0f28 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 988d38387..5ba682ad0 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 113bce7e9..1b07c89bb 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: 'ubuntu1804-builder-4c-4g' + build-node: 'ubuntu2004-builder-4c-4g' subproject: - 'multivimbroker': path: 'multivimbroker' diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 428535a0f..042032003 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 686a8d69b..7c848a72c 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: 'ubuntu1804-builder-4c-4g' + build-node: 'ubuntu2004-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 45cccb121..19981613d 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: 'ubuntu1804-builder-4c-4g' + build-node: 'ubuntu2004-builder-4c-4g' subproject: - 'vio': path: 'vio' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index f78ca6d7e..60060fd6c 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g +# build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 0985d66c2..2d1351687 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 1450e9c16..8b6b86755 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g - project: diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 93fabe716..94623c229 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g - project: name: oom-registrator-clm diff --git a/jjb/oom/oom-templates.yaml b/jjb/oom/oom-templates.yaml index 3134bef03..a82cf343e 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g node: '{build-node}' parameters: diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 513b73c4d..12acb6186 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -28,7 +28,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 03b9be801..b02699eda 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g parameters: - string: @@ -71,7 +71,7 @@ concurrent: false - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g triggers: - jms-messaging: diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index cb524824a..970965d93 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: 'ubuntu1804-builder-4c-4g' + build-node: 'ubuntu2004-builder-4c-4g' - project: name: optf-has-sonar diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 0022aff27..18865fb75 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: 'ubuntu1804-builder-4c-4g' + build-node: 'ubuntu2004-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 54c6a5c77..bacce4af7 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 0378b893a..1e2742404 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 9b9069890..b8e3d3ecc 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 53404fd5c..46110b40c 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 74c90118b..acbd37eb3 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 7cbce5688..ae3204e2a 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 6153fe91a..ccb8760ad 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 f7306937d..eb901d88c 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 7bfdc8f8e..b32905da4 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 f0e647338..cadb818f7 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 bf54cd098..5efff5347 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 cdddf2f22..269dd5e6a 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 e720f3211..d76cde04a 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 ab23a6737..798a64410 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 d365db5a5..647edd1d7 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 32d9507fb..135ea5dee 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -61,7 +61,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 5857c1c84..12a33a6d0 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -28,7 +28,7 @@ mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g maven-version: 'mvn36' - project: diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index 1cf4aad13..ae780562a 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 9b0c252b7..b4c4f8761 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 e4eff9dec..87528eeff 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -37,7 +37,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 732771735..2287a8cdd 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -53,7 +53,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn38" - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g project: 'sdnc/apps' project-name: 'sdnc-apps' branch: 'master' @@ -103,7 +103,7 @@ nexus-iq-namespace: 'onap-' project: sdnc/apps project-name: 'sdnc-apps' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 6c834a01d..d472d95ec 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index e09e3ec8b..34666de1e 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -36,7 +36,7 @@ mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g shallow-clone: true mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -66,7 +66,7 @@ nexus-iq-namespace: 'onap-' project: sdnc/oam project-name: 'sdnc-oam' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 984647542..e0f23ce33 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g project: 'so/libs' project-name: 'so-libs' java-version: openjdk11 diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index e4983fdc2..8d2617772 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: 'ubuntu1804-builder-4c-4g' + build-node: 'ubuntu2004-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: 'ubuntu1804-builder-4c-4g' + build-node: 'ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 1a10bf10c..a991233e8 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml index bb984aebb..079148786 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 a4241e71f..213710b02 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 4965f82c7..da75aff9d 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 589a7adc2..ded6cb7a4 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 797e0a0d6..7ef2f8420 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 1445f9b78..d4760b1e5 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 2bb891beb..c99f1e3c7 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 6551d45d9..290a533e0 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 5bdf8e411..c98fc0939 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g subproject: - 'res': path: 'res' diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 679cc45e3..5a6a3c941 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 1db7b6777..8af1b6e5d 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 db89affc4..77e955b52 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 0cad04b23..860d60934 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 ac6138a0e..2424119f9 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 52aee732c..599252b10 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 db2b6bb8b..4651b445e 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 5c77ac299..15a9025bd 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 89726b48c..ddc4574cc 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 19791ef28..f15dc6397 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 49c7c019d..22b9d28d5 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index 19c88c39b..9bc1c346c 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml index 6d22310e6..26e33e40a 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 519c4471f..a9d2819a7 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 4364220f5..46e09f485 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g stream: - 'master': branch: 'master'