From f1a0754379362f8edbb63509e9c76df5a03ff0c9 Mon Sep 17 00:00:00 2001 From: Bengt Thuree Date: Wed, 28 Sep 2022 09:58:45 +1000 Subject: [PATCH] Chore: Move to ubuntu2004-docker jjb/sdc/sdc-sdc-distribution-client.yaml jjb/sdc/sdc-sdc-docker-base.yaml jjb/sdc/sdc-sdc-helm-validator.yaml jjb/sdc/sdc-sdc-workflow-designer.yaml jjb/sdc/sdc.yaml jjb/sdnc/sdnc-apps.yaml jjb/sdnc/sdnc-oam.yaml jjb/so/so-adapters-so-cnf-adapter.yaml jjb/so/so-adapters-so-etsi-sol003-adapter.yaml jjb/so/so-adapters-so-etsi-sol005-adapter.yaml jjb/so/so-adapters-so-nssmf-adapter.yaml jjb/so/so-adapters-so-oof-adapter.yaml jjb/so/so-so-admin-cockpit.yaml jjb/so/so-so-etsi-nfvo.yaml jjb/so/so.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree Change-Id: Idc4566f2388c63b6962dc8250fbea5f13a7e6b09 --- jjb/sdc/sdc-sdc-distribution-client.yaml | 2 +- jjb/sdc/sdc-sdc-docker-base.yaml | 6 +++--- jjb/sdc/sdc-sdc-helm-validator.yaml | 6 +++--- jjb/sdc/sdc-sdc-workflow-designer.yaml | 2 +- jjb/sdc/sdc.yaml | 14 +++++++------- jjb/sdnc/sdnc-apps.yaml | 6 +++--- jjb/sdnc/sdnc-oam.yaml | 4 ++-- jjb/so/so-adapters-so-cnf-adapter.yaml | 6 +++--- jjb/so/so-adapters-so-etsi-sol003-adapter.yaml | 8 ++++---- jjb/so/so-adapters-so-etsi-sol005-adapter.yaml | 6 +++--- jjb/so/so-adapters-so-nssmf-adapter.yaml | 6 +++--- jjb/so/so-adapters-so-oof-adapter.yaml | 6 +++--- jjb/so/so-so-admin-cockpit.yaml | 10 +++++----- jjb/so/so-so-etsi-nfvo.yaml | 8 ++++---- jjb/so/so.yaml | 10 +++++----- 15 files changed, 50 insertions(+), 50 deletions(-) diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 32d9507fb..530f9f6c0 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -37,7 +37,7 @@ java-version: openjdk11 jobs: - '{project-name}-{stream}-integration-pairwise' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g project: 'sdc/sdc-distribution-client' project-name: 'sdc-sdc-distribution-client' stream: diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 5857c1c84..7c32448b6 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -5,14 +5,14 @@ project-name: 'sdc-sdc-docker-base' jobs: - '{project-name}-{stream}-verify-java': - build-node: 'ubuntu1804-docker-v1-8c-8g' + build-node: 'ubuntu2004-docker-v1-8c-8g' docker-pom: 'pom.xml' - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu1804-docker-8c-8g' + build-node: 'ubuntu2004-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'default' - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g maven-versions-plugin: true mvn-params: '-P default' container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml index 39010d320..7bbf0307b 100644 --- a/jjb/sdc/sdc-sdc-helm-validator.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator.yaml @@ -26,7 +26,7 @@ maven-versions-plugin: true mvn-goals: 'clean deploy' - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean install docker:build docker:push' container-public-registry: 'nexus3.onap.org:10001' @@ -40,7 +40,7 @@ branch: 'master' files: '**' archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g - project: @@ -54,7 +54,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g project: 'sdc/sdc-helm-validator' project-name: 'sdc-sdc-helm-validator' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index e4eff9dec..c501dd704 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -17,7 +17,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 46b4b79ea..621eac890 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -30,9 +30,9 @@ - '{project-name}-{stream}-verify-java': # this build is unit test only (Verify 1/2) mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - build-node: 'ubuntu1804-docker-8c-8g' + build-node: 'ubuntu2004-docker-8c-8g' - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu1804-docker-8c-16g' + build-node: 'ubuntu2004-docker-8c-16g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator' @@ -53,7 +53,7 @@ maven-versions-plugin: true mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' mvn-version: 'mvn36' @@ -73,7 +73,7 @@ mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g maven-version: 'mvn36' - project: @@ -87,7 +87,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-docker-8c-16g + build-node: ubuntu2004-docker-8c-16g project: 'sdc' project-name: 'sdc' branch: 'master' @@ -108,7 +108,7 @@ nexus-iq-namespace: 'onap-' project: sdc project-name: 'sdc' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g stream: - 'master': branch: 'master' @@ -130,7 +130,7 @@ - project: name: 'sdc-whitesource' project-name: 'sdc' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g jobs: - gerrit-whitesource-scan: build-timeout: 120 diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 732771735..32399536c 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -10,7 +10,7 @@ project-name: 'sdnc-apps' jobs: - gerrit-maven-verify: - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Ddocker.skip.push=true -Pdocker' @@ -24,7 +24,7 @@ cron: '' sbom-generator: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -Pdocker' @@ -94,7 +94,7 @@ # mvn-settings: 'sdnc-apps-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g +# build-node: ubuntu2004-docker-arm64-4c-2g - project: name: sdnc-apps-clm diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index e09e3ec8b..c109f455c 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -15,7 +15,7 @@ cron: '' sbom-generator: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu2004-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker' @@ -57,7 +57,7 @@ # mvn-settings: 'sdnc-oam-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g +# build-node: ubuntu2004-docker-arm64-4c-2g - project: name: sdnc-oam-clm diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml index e0f1fa141..f46cc4d3b 100644 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-cnf-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g - project: name: so-adapters-so-cnf-adapter-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g project: 'so/adapters/so-cnf-adapter' project-name: 'so-adapters-so-cnf-adapter' branch: 'master' diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index 86f3f21a6..1c4e5b1c7 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g - project: name: so-adapters-so-etsi-sol003-adapter-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g project: 'so/adapters/so-etsi-sol003-adapter' project-name: 'so-adapters-so-etsi-sol003-adapter' branch: 'master' @@ -72,7 +72,7 @@ nexus-iq-namespace: 'onap-' project: 'so/adapters/so-etsi-sol003-adapter' project-name: 'so-adapters-so-etsi-sol003-adapter' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index 2d1a8d545..398852ff2 100644 --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g - project: name: so-adapters-so-etsi-sol005-adapter-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g project: 'so/adapters/so-etsi-sol005-adapter' project-name: 'so-adapters-so-etsi-sol005-adapter' branch: 'master' diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index d230d005e..88b6eeca9 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -45,7 +45,7 @@ mvn-settings: 'so-adapters-so-nssmf-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g - project: name: so-adapters-so-nssmf-adapter-sonar @@ -59,7 +59,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g project: 'so/adapters/so-nssmf-adapter' project-name: 'so-adapters-so-nssmf-adapter' branch: 'master' diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml index 2138fcf9a..2fbec6a08 100644 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-oof-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g - project: name: so-adapters-so-oof-adapter-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g project: 'so/adapters/so-oof-adapter' project-name: 'so-adapters-so-oof-adapter' branch: 'master' diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml index 7e5614400..ab625623f 100644 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-so-admin-cockpit-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g - project: name: so-so-admin-cockpit-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g project: 'so/so-admin-cockpit' project-name: 'so-so-admin-cockpit' branch: 'master' @@ -70,7 +70,7 @@ jobs: - 'onap-gerrit-maven-coverity' cron: '@daily' - build-node: 'ubuntu1804-docker-v1-8c-8g' + build-node: 'ubuntu2004-docker-v1-8c-8g' project: 'so/so-admin-cockpit' project-name: 'so-so-admin-cockpit' branch: 'master' @@ -101,7 +101,7 @@ nexus-iq-namespace: 'onap-' project: 'so/so-admin-cockpit' project-name: 'so-so-admin-cockpit' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml index 5a54d934a..ee6b43fce 100644 --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -24,7 +24,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -42,7 +42,7 @@ mvn-settings: 'so-so-etsi-nfvo-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g - project: name: so-so-etsi-nfvo-sonar @@ -56,7 +56,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g project: 'so/so-etsi-nfvo' project-name: 'so-so-etsi-nfvo' branch: 'master' @@ -72,7 +72,7 @@ nexus-iq-namespace: 'onap-' project: 'so/so-etsi-nfvo' project-name: 'so-so-etsi-nfvo' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 510e10879..716bd6559 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -17,7 +17,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' @@ -38,7 +38,7 @@ mvn-settings: 'so-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g - project: name: so-sonar @@ -52,7 +52,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g project: 'so' project-name: 'so' branch: 'master' @@ -66,7 +66,7 @@ jobs: - 'onap-gerrit-maven-coverity' cron: '@daily' - build-node: 'ubuntu1804-docker-v1-8c-8g' + build-node: 'ubuntu2004-docker-v1-8c-8g' project: 'so' project-name: 'so' branch: 'master' @@ -97,7 +97,7 @@ nexus-iq-namespace: 'onap-' project: so project-name: 'so' - build-node: ubuntu1804-docker-v1-8c-8g + build-node: ubuntu2004-docker-v1-8c-8g stream: - 'master': branch: 'master' -- 2.16.6