diff options
Diffstat (limited to 'jjb/multicloud')
7 files changed, 15 insertions, 11 deletions
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 7d7e3b9c5..f4dfa6e23 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -13,6 +13,8 @@ pattern: 'multivimbroker/**' jobs: - gerrit-maven-clm + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,13 +25,13 @@ !include-raw-escape: 'build-multicloud-framework-docker-image.sh' files: '**' archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-builder-4c-4g - project: name: multicloud-framework-sonar jobs: - gerrit-maven-sonar cron: 'H 11 * * *' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-builder-4c-4g project: 'multicloud/framework' project-name: 'multicloud-framework' branch: 'master' diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml index 4fcad3e3d..c8b4b35ad 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-basebuild-4c-4g' + build-node: 'ubuntu1604-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 71c11162f..257910f7c 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -13,6 +13,8 @@ pattern: 'vio/**' jobs: - gerrit-maven-clm + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -23,13 +25,13 @@ !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh' files: '**' archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-builder-4c-4g - project: name: multicloud-openstack-vmware-sonar jobs: - gerrit-maven-sonar cron: 'H 11 * * *' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack/vmware' project-name: 'multicloud-openstack-vmware' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml index 62e52f244..a23ecf3d4 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-basebuild-4c-4g' + build-node: 'ubuntu1604-builder-4c-4g' subproject: - 'vio': path: 'vio' diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml index 1d4fa6b33..2bcb2e870 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml @@ -22,4 +22,4 @@ !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh' files: '**' archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml index 0a8fcd4a0..ca22904a6 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' mvn-settings: 'multicloud-openstack-vmware-settings' - build-node: 'ubuntu1604-basebuild-4c-4g' + build-node: 'ubuntu1604-builder-4c-4g' subproject: - 'vesagent': path: 'vesagent' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 9260ea9aa..dffbd1f4f 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -47,7 +47,7 @@ jobs: - gerrit-maven-sonar cron: 'H 11 * * *' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-newton' branch: 'master' @@ -60,7 +60,7 @@ jobs: - gerrit-maven-sonar cron: 'H 11 * * *' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-ocata' branch: 'master' @@ -73,7 +73,7 @@ jobs: - gerrit-maven-sonar cron: 'H 11 * * *' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-windriver' branch: 'master' |