From b0036ebdd10725a893b61791794291ffd03c4a4c Mon Sep 17 00:00:00 2001 From: Ofir Sonsino Date: Sun, 29 Mar 2020 12:39:35 +0300 Subject: [PATCH] Move SDC to Ubunto1804 nodes Change-Id: Icd22b2bb30f51b81e79f3ac8d002a283bbb3b1e7 Issue-ID: SDC-2857 Signed-off-by: Ofir Sonsino --- jjb/sdc/sdc-dcae-d-ci.yaml | 4 ++-- jjb/sdc/sdc-dcae-d-dt-be-main.yaml | 4 ++-- jjb/sdc/sdc-dcae-d-dt-be-property.yaml | 2 +- jjb/sdc/sdc-dcae-d-dt.yaml | 4 ++-- jjb/sdc/sdc-dcae-d-fe.yaml | 4 ++-- jjb/sdc/sdc-dcae-d-tosca-lab.yaml | 6 +++--- jjb/sdc/sdc-microservices.yaml | 2 +- jjb/sdc/sdc-onap-ui-angular.yaml | 2 +- jjb/sdc/sdc-onap-ui-common.yaml | 2 +- jjb/sdc/sdc-onap-ui-react.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 | 8 ++++---- jjb/sdc/sdc-sdc-pubsub.yaml | 2 +- jjb/sdc/sdc-sdc-tosca.yaml | 2 +- jjb/sdc/sdc-sdc-workflow-designer.yaml | 8 ++++---- jjb/sdc/sdc.yaml | 10 +++++----- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index ae024000b..bd2f1d43f 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests=true' container-public-registry: 'nexus3.onap.org:10001' @@ -58,7 +58,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/dcae-d/ci' project-name: 'sdc-dcae-d-ci' branch: 'master' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index eebb04d5f..0fdee27c1 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests=true' container-public-registry: 'nexus3.onap.org:10001' @@ -55,7 +55,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/dcae-d/dt-be-main' project-name: 'sdc-dcae-d-dt-be-main' branch: 'master' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml index 8762c0880..71801952b 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -28,7 +28,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/dcae-d/dt-be-property' project-name: 'sdc-dcae-d-dt-be-property' branch: 'master' diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 6531c545a..41847c34f 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -11,7 +11,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P server,docker -DskipTests=true' container-public-registry: 'nexus3.onap.org:10001' @@ -57,7 +57,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/dcae-d/dt' project-name: 'sdc-dcae-d-dt' branch: 'master' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index f5693cb28..fa80c5370 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -11,7 +11,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests=true' container-public-registry: 'nexus3.onap.org:10001' @@ -56,7 +56,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/dcae-d/fe' project-name: 'sdc-dcae-d-fe' branch: 'master' diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index 54fd89857..1165d58cb 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -11,11 +11,11 @@ path: '.' pattern: '**' mvn-settings: 'sdc-dcae-d-tosca-lab-settings' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-{subproject}-verify-python' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P default -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -54,7 +54,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'sdc/dcae-d/tosca-lab' project-name: 'sdc-dcae-d-tosca-lab' branch: 'master' diff --git a/jjb/sdc/sdc-microservices.yaml b/jjb/sdc/sdc-microservices.yaml index cf843d6f4..0aad2486a 100644 --- a/jjb/sdc/sdc-microservices.yaml +++ b/jjb/sdc/sdc-microservices.yaml @@ -45,7 +45,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/microservices' project-name: 'sdc-microservices' branch: 'master' diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml index f3cf9443e..ef6ff5a88 100644 --- a/jjb/sdc/sdc-onap-ui-angular.yaml +++ b/jjb/sdc/sdc-onap-ui-angular.yaml @@ -40,7 +40,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-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 d2f580662..7f6689f2c 100644 --- a/jjb/sdc/sdc-onap-ui-common.yaml +++ b/jjb/sdc/sdc-onap-ui-common.yaml @@ -34,7 +34,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/onap-ui-common' project-name: 'sdc-onap-ui-common' branch: 'master' diff --git a/jjb/sdc/sdc-onap-ui-react.yaml b/jjb/sdc/sdc-onap-ui-react.yaml index bac85d2b8..45b97928a 100644 --- a/jjb/sdc/sdc-onap-ui-react.yaml +++ b/jjb/sdc/sdc-onap-ui-react.yaml @@ -34,7 +34,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/onap-ui-react' project-name: 'sdc-onap-ui-react' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml index b9e51a6e5..487967d7a 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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-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 f509791c8..7250a8472 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -38,7 +38,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-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 c0d796482..57726b71e 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -8,11 +8,11 @@ build-node: 'ubuntu1804-docker-v1-8c-8g' docker-pom: 'pom.xml' - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'default' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P default' container-public-registry: 'nexus3.onap.org:10001' @@ -26,7 +26,7 @@ mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-4c-4g maven-version: 'mvn35' #- project: @@ -34,7 +34,7 @@ # project-name: 'sdc-sdc-docker-base-arm64' # jobs: # - '{project-name}-{stream}-sdc-merge-java': -# build-node: 'ubuntu1604-docker-8c-8g' +# build-node: 'ubuntu1804-docker-8c-8g' # docker-pom: 'pom.xml' # mvn-profile: 'default' # project: 'sdc/sdc-docker-base' diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index 78564262f..adaa2d5d0 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -34,7 +34,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-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 798a7a698..51d91ee5c 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -38,7 +38,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-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 b2d42b961..9bc31df3c 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -35,7 +35,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g maven-version: 'mvn35' #- project: @@ -66,7 +66,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-workflow-designer' project-name: 'sdc-sdc-workflow-designer' branch: 'master' @@ -82,7 +82,7 @@ nexus-iq-namespace: 'onap-' project: sdc/sdc-workflow-designer project-name: 'sdc-sdc-workflow-designer' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'sdc-sdc-workflow-designer-settings' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index f17fd1a64..756618edb 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -58,7 +58,7 @@ mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-4c-4g maven-version: 'mvn35' #- project: @@ -90,7 +90,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar" cron: '@daily' - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-4c-4g project: 'sdc' project-name: 'sdc' branch: 'master' @@ -109,7 +109,7 @@ nexus-iq-namespace: 'onap-' project: sdc project-name: 'sdc-catalog' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g branch: 'master' mvn-settings: 'sdc-settings' @@ -123,7 +123,7 @@ nexus-iq-namespace: 'onap-' project: sdc project-name: 'sdc-onboarding' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g branch: 'master' mvn-settings: 'sdc-settings' @@ -139,7 +139,7 @@ - project: name: 'sdc-whitesource' project-name: 'sdc' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - gerrit-whitesource-scan: build-timeout: 120 -- 2.16.6