From 4d8a80f75d00ab80941b8b1340b7cf15e4827aa5 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Tue, 17 Mar 2020 22:04:51 +0800 Subject: Update building node for multicloud jobs Issue-ID: MULTICLOUD-1034 Signed-off-by: Bin Yang Change-Id: I830d710ce89910b428b324fef8032f498d0595ea --- jjb/multicloud/multicloud-azure-java.yaml | 6 +++--- jjb/multicloud/multicloud-azure-python.yaml | 2 +- jjb/multicloud/multicloud-framework-java.yaml | 8 ++++---- jjb/multicloud/multicloud-framework-python.yaml | 2 +- jjb/multicloud/multicloud-openstack-vmware-java.yaml | 8 ++++---- jjb/multicloud/multicloud-openstack-vmware-python.yaml | 2 +- jjb/multicloud/multicloud-openstack.yaml | 12 ++++++------ 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index 11002abeb..da9827bc0 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -21,7 +21,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-goals: install mvn-params: '-P docker' maven-versions-plugin: true @@ -29,7 +29,7 @@ container-staging-registry: 'nexus3.onap.org:10003' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g #- project: # name: multicloud-azure-arm64-java @@ -63,7 +63,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/azure' project-name: 'multicloud-azure' branch: 'master' diff --git a/jjb/multicloud/multicloud-azure-python.yaml b/jjb/multicloud/multicloud-azure-python.yaml index 5066a4cca..8aec29b5e 100644 --- a/jjb/multicloud/multicloud-azure-python.yaml +++ b/jjb/multicloud/multicloud-azure-python.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' mvn-settings: 'multicloud-azure-settings' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'azure': path: 'azure' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index c6f0e77b7..323311824 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -20,7 +20,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-goals: install mvn-params: '-P docker' maven-versions-plugin: true @@ -34,7 +34,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: multicloud-framework-arm64-java @@ -68,7 +68,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/framework' project-name: 'multicloud-framework-multivimbroker' branch: 'master' @@ -98,7 +98,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-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 c8b4b35ad..d81081a1d 100644 --- a/jjb/multicloud/multicloud-framework-python.yaml +++ b/jjb/multicloud/multicloud-framework-python.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' mvn-settings: 'multicloud-framework-settings' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'multivimbroker': path: 'multivimbroker' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index b2d22932c..4dad5cb27 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -17,7 +17,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-goals: install mvn-params: '-P docker' maven-versions-plugin: true @@ -31,7 +31,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: multicloud-openstack-vmware-arm64-java @@ -65,7 +65,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack/vmware' project-name: 'multicloud-openstack-vmware' branch: 'master' @@ -80,7 +80,7 @@ nexus-iq-namespace: 'onap-' project: multicloud/openstack/vmware project-name: 'multicloud-openstack-vmware' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' branch: 'master' mvn-settings: 'multicloud-openstack-vmware-settings' diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml index a23ecf3d4..973ca5162 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: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'vio': path: 'vio' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 8192bf3c2..764748fd1 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: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-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: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-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: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-starlingx' branch: 'master' @@ -174,7 +174,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-fcaps' branch: 'master' @@ -193,7 +193,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' # cron: '@daily' -# build-node: ubuntu1604-builder-4c-4g +# build-node: ubuntu1804-builder-4c-4g # project: 'multicloud/openstack' # project-name: 'multicloud-openstack-lenovo' # branch: 'master' @@ -212,7 +212,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-hpa' branch: 'master' -- cgit 1.2.3-korg