From 6d7512524ac903f51a2df5ae240f9df2b87366d3 Mon Sep 17 00:00:00 2001 From: Bengt Thuree Date: Wed, 28 Sep 2022 09:54:49 +1000 Subject: [PATCH] Chore: Move to ubuntu2004-builder jjb/aai/aai-aai-common.yaml jjb/aai/aai-babel.yaml jjb/aai/aai-graphadmin.yaml jjb/aai/aai-graphgraph.yaml jjb/aai/aai-logging-service.yaml jjb/aai/aai-model-loader.yaml jjb/aai/aai-resources.yaml jjb/aai/aai-rest-client.yaml jjb/aai/aai-schema-service.yaml jjb/aai/aai-sparky-be.yaml jjb/aai/aai-sparky-fe.yaml jjb/aai/aai-traversal.yaml jjb/ccsdk/apps.yaml jjb/cli/cli.yaml jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree Change-Id: I60c4379369bd1cc973c6d5114287c773fecdeec8 --- jjb/aai/aai-aai-common.yaml | 6 +++--- jjb/aai/aai-babel.yaml | 4 ++-- jjb/aai/aai-graphadmin.yaml | 4 ++-- jjb/aai/aai-graphgraph.yaml | 2 +- jjb/aai/aai-logging-service.yaml | 2 +- jjb/aai/aai-model-loader.yaml | 4 ++-- jjb/aai/aai-resources.yaml | 2 +- jjb/aai/aai-rest-client.yaml | 2 +- jjb/aai/aai-schema-service.yaml | 4 ++-- jjb/aai/aai-sparky-be.yaml | 2 +- jjb/aai/aai-sparky-fe.yaml | 4 ++-- jjb/aai/aai-traversal.yaml | 2 +- jjb/ccsdk/apps.yaml | 4 ++-- jjb/cli/cli.yaml | 6 +++--- jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index f5f44f018..c43e70277 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' stream: diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index b55d06a96..823b7d43c 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -33,7 +33,7 @@ mvn-settings: 'aai-babel-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 593a6aa47..12b6efcd4 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -33,7 +33,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 dc9a63fdc..484c8be59 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -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: '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 f211a2656..ef473182a 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 cc3b665ea..bfc961eb0 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -33,7 +33,7 @@ mvn-settings: 'aai-model-loader-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g project: 'aai/model-loader' project-name: 'aai-model-loader' branch: 'master' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index b8eb752b0..6ffc4234c 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -37,7 +37,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g java-version: openjdk8 - project: diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 45bdd0aaa..a26b6ec21 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 663dc3b02..8fdaf1187 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -33,7 +33,7 @@ mvn-version: 'mvn36' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 e86672f96..a1a5c3352 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.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: 'aai/sparky-be' project-name: 'aai-sparky-be' branch: 'master' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 0f0bd8dfc..e25120ab5 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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 1e8f38228..7273498f1 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -36,7 +36,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g java-version: openjdk8 - project: diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 399c1bca5..9fb97a0c8 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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-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: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g #- project: # name: ccsdk-apps-arm64-docker diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index bc9455641..3f1c3519c 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -41,7 +41,7 @@ mvn-settings: 'cli-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g #- project: # name: cli-arm64 @@ -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: 'cli' project-name: 'cli' branch: 'master' @@ -90,7 +90,7 @@ project-name: 'cli' branch: 'master' mvn-settings: 'cli-settings' - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2004-builder-4c-4g - project: name: cli-info diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index a253c125e..56708fe18 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -43,7 +43,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/collectors/snmptrap' project-name: 'dcaegen2-collectors-snmptrap' branch: 'master' -- 2.16.6