From: Bengt Thuree Date: Tue, 27 Sep 2022 23:54:52 +0000 (+1000) Subject: Chore: Move to ubuntu2004-builder X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=0e9584e187edb624e37bb3f1845df100bf8b5a1d Chore: Move to ubuntu2004-builder jjb/dcaegen2/dcaegen2-services-mapper.yaml jjb/demo/demo.yaml jjb/dmaap/dmaap-buscontroller.yaml jjb/dmaap/dmaap-datarouter.yaml jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml jjb/dmaap/dmaap-messagerouter-messageservice.yaml jjb/externalapi/externalapi-nbi.yaml jjb/global-defaults.yaml jjb/holmes/holmes-common.yaml jjb/holmes/holmes-engine-mgt.yaml jjb/holmes/holmes-rule-mgt.yaml jjb/integration/integration-templates.yaml jjb/integration/integration.yaml jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml jjb/lab/lab-templates.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree Change-Id: I047a44051417e27667de82c38bd016d9941ef76e --- diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index e6bbdbeb2..4d9c6c641 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.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: 'dcaegen2/services/mapper' project-name: 'dcaegen2-services-mapper' branch: 'master' 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..48adacc8f 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -32,7 +32,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 +45,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..5fcab2f38 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -32,7 +32,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 +45,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..857baf427 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -32,7 +32,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 +45,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: