Revert "Update CentOS7 builder to the latest"

This latest builder seems to not have Puppet properly installed,
as Facter seems to be missing which is making all jobs fail in
the cloud-init stage as the VM cannot bootstrap.

This reverts commit 046d5f8049d60a1f30dc28827b7c797310642c58.

Change-Id: I336ac41ea70ad8c6d3f5b9928c83dba8a88da570
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg
index c9c9bc9601996b4a116d9f0ee070b16f5eef191c..3a1cdc1b880023a6bda94f30add5c7c76078e46b 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 VOLUME_SIZE=100
 HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
index 54274d857d3450c44f2e51eba610a709ee0b4a7d..d916173943abe3431d9a8b9e67b97712ae35b2e9 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 VOLUME_SIZE=150
 HARDWARE_ID=odl-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg
index 75089bdc0ce29a834c61b03d205ede4ff570c992..9f43575070f0c1d4df80cf100750d988e58275dd 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 VOLUME_SIZE=150
 HARDWARE_ID=odl-standard-8

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
index cb7e489d708e988f7512e19d08f63a41f877ad95..b1fdbea47424a66274143544958dd5fff6e97378 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 VOLUME_SIZE=150
 HARDWARE_ID=odl-highcpu-8

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
index 2e47552b62c0a3f9e31afd6309700f5d4a8fa6fc..bcad551f9467344f92413c67c2c61ba9814de1e9 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 HARDWARE_ID=v1-standard-1

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
index 9daeda90e0f16f3e71719b84d9375b219e89d54a..2957d7bdb77ad67b70c1dda16cbf5e593e81fb71 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
index a6473e259bc2070b8885ac1d1a0e3e565ceab249..4f6a55303ca1641f72687343cff413d215991cbc 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 HARDWARE_ID=odl-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
index 9fbf9ddfd4886e77ca57871776bef7b17e4c2456..b2dbd987f842b6a61b0de534905bac07166092f9 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 HARDWARE_ID=odl-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
index 4ecf1e2a3e66b8ef7e0a304806848e3b448a7ff2..9833ce6f666ae9b7b91e3887588ef7a9446941c6 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 HARDWARE_ID=odl-highcpu-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
index f978c81a8c0eb0b57d73d71fde346c747b83ef9d..03a1a5d931e708e791102af404b88d10771f02dc 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 HARDWARE_ID=odl-highcpu-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 53ecb2f55e6ac0ecdddf80c29e0ccbb31fa56464..3b2dfb250b15239cba5d4c3f70b0323f21113fce 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 9bd6aa31f9090a53289b74fea30289ada42f997e..ef6157e41f7d94ec9d40d774dd90e38407c537cc 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -78,7 +78,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
@@ -184,7 +184,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
@@ -487,7 +487,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
@@ -596,7 +596,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
@@ -901,7 +901,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     docker_system_count: 1
     docker_system_flavor: 'odl-standard-1'
     docker_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
@@ -1033,7 +1033,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
     openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
@@ -1445,7 +1445,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
     openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'