From 3a761c98750efc1da48c3ef83fcad07393a18aaf Mon Sep 17 00:00:00 2001 From: Bengt Thuree Date: Wed, 28 Sep 2022 09:54:55 +1000 Subject: [PATCH] Chore: Move to ubuntu2004-builder jjb/modeling/modeling-etsicatalog.yaml jjb/msb/msb-apigateway.yaml jjb/msb/msb-discovery.yaml jjb/msb/msb-java-sdk.yaml jjb/msb/msb-swagger-sdk.yaml jjb/multicloud/multicloud-framework-java.yaml jjb/multicloud/multicloud-framework-python.yaml jjb/multicloud/multicloud-k8s.yaml jjb/multicloud/multicloud-openstack-vmware-java.yaml jjb/multicloud/multicloud-openstack-vmware-python.yaml jjb/multicloud/multicloud-openstack.yaml jjb/music/music-distributed-kv-store.yaml jjb/music/music-jar.yaml jjb/oom/oom-registrator.yaml jjb/oom/oom-templates.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree Change-Id: If2742342f878a48b2f2f64eeb58b6ba3484c3a76 --- jjb/modeling/modeling-etsicatalog.yaml | 4 ++-- jjb/msb/msb-apigateway.yaml | 4 ++-- jjb/msb/msb-discovery.yaml | 4 ++-- jjb/msb/msb-java-sdk.yaml | 4 ++-- jjb/msb/msb-swagger-sdk.yaml | 4 ++-- jjb/multicloud/multicloud-framework-java.yaml | 6 +++--- jjb/multicloud/multicloud-framework-python.yaml | 2 +- jjb/multicloud/multicloud-k8s.yaml | 2 +- jjb/multicloud/multicloud-openstack-vmware-java.yaml | 6 +++--- jjb/multicloud/multicloud-openstack-vmware-python.yaml | 2 +- jjb/multicloud/multicloud-openstack.yaml | 12 ++++++------ jjb/music/music-distributed-kv-store.yaml | 2 +- jjb/music/music-jar.yaml | 2 +- jjb/oom/oom-registrator.yaml | 2 +- jjb/oom/oom-templates.yaml | 2 +- 15 files changed, 29 insertions(+), 29 deletions(-) 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: -- 2.16.6