From c680515bc20928aa1e3c77f78fcc468c54b5631f Mon Sep 17 00:00:00 2001 From: Bengt Thuree Date: Wed, 28 Sep 2022 09:55:00 +1000 Subject: [PATCH] Chore: Move to ubuntu2004-builder jjb/policy/policy-xacml-pdp.yaml jjb/sdc/sdc-onap-ui-angular.yaml jjb/sdc/sdc-onap-ui-common.yaml jjb/sdc/sdc-sdc-be-common.yaml jjb/sdc/sdc-sdc-distribution-client.yaml jjb/sdc/sdc-sdc-docker-base.yaml jjb/sdc/sdc-sdc-pubsub.yaml jjb/sdc/sdc-sdc-tosca.yaml jjb/sdc/sdc-sdc-workflow-designer.yaml jjb/sdnc/sdnc-apps.yaml jjb/sdnc/sdnc-northbound.yaml jjb/sdnc/sdnc-oam.yaml jjb/so/so-libs.yaml jjb/testsuite/testsuite-python-testing-utils.yaml jjb/usecaseui/usecase-ui-intent-analysis.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree Change-Id: Ie6606c520266ef6299b8ee599858f47ce0c75734 --- jjb/policy/policy-xacml-pdp.yaml | 4 ++-- jjb/sdc/sdc-onap-ui-angular.yaml | 2 +- jjb/sdc/sdc-onap-ui-common.yaml | 2 +- jjb/sdc/sdc-sdc-be-common.yaml | 2 +- jjb/sdc/sdc-sdc-distribution-client.yaml | 2 +- jjb/sdc/sdc-sdc-docker-base.yaml | 2 +- jjb/sdc/sdc-sdc-pubsub.yaml | 2 +- jjb/sdc/sdc-sdc-tosca.yaml | 2 +- jjb/sdc/sdc-sdc-workflow-designer.yaml | 6 +++--- jjb/sdnc/sdnc-apps.yaml | 6 +++--- jjb/sdnc/sdnc-northbound.yaml | 6 +++--- jjb/sdnc/sdnc-oam.yaml | 4 ++-- jjb/so/so-libs.yaml | 2 +- jjb/testsuite/testsuite-python-testing-utils.yaml | 6 +++--- jjb/usecaseui/usecase-ui-intent-analysis.yaml | 6 +++--- 15 files changed, 27 insertions(+), 27 deletions(-) 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' -- 2.16.6