Use centos7-builder-4c-16g for autorelease jobs

Switch to using the centos7-builder-4c-16g. The custom autorelease
builder used to be a completely different VM image for autorelease
however today this is effectively the same image in both cases so
reduce overhead and switch to the standard name of the image.

Change-Id: I6dee5388415eeb369f1f04194a7c4bbff6711541
Signed-off-by: Thanh Ha <zxiiro@gmail.com>

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
deleted file mode 100644 (file)
index 9859e38..0000000
--- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204
-VOLUME_SIZE=150
-HARDWARE_ID=odl-standard-4

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 8557af447f38aa3a5bbb3adf9239fe331fdf9aa3..72cd0c6cd4fc83681a26cd8178484bf154258979 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -5,9 +5,8 @@
       - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-4c-16g
-      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-4c-16g
+          build-node: centos7-builder-4c-16g
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}'
 
     stream:
       - sodium:
@@ -42,7 +41,7 @@
     jobs:
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-4c-16g
+          build-node: centos7-builder-4c-16g
       - 'autorelease-update-submodules-{stream}'
       - 'autorelease-update-validate-jobs-{stream}'
       - '{project-name}-validate-autorelease-{stream}'