Merge "Update cloud image CentOS7 builder x86_64"

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 d49cab9ab6a0c575d3bdb147745bbb54575ca2bf..7e4888468c068d670a43eae537a09f0a681050e5 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,3 +1,3 @@
 LABELS=centos7-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
 HARDWARE_ID=v3-standard-2

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 3fe778c1f7cbc14b9c726057749e5a104d2d12e5..3574e52b72a23f9694782ddfa8b931db0bb6c528 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,3 +1,3 @@
 LABELS=centos7-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
 HARDWARE_ID=v3-standard-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 61e2e810da99ff49a8abab098b9d5fa8854c9137..c38bb96046051ca01d5d2c1dd14e4f79c22f587d 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,3 +1,3 @@
 LABELS=centos7-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
 HARDWARE_ID=v3-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 e0bcabe0cab165076a891fedc1723140667434de..7a15b9eb01e5593f0cba615801a1decbe6927580 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,3 +1,3 @@
 LABELS=centos7-builder-4c-16g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
 HARDWARE_ID=v3-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 7c7ce78b71c09b1ad01f7430272b4a6cb906b0a4..e38ee2904ca4e429fa7f6523af8442261fd05b2f 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,3 +1,3 @@
 LABELS=centos7-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
 HARDWARE_ID=v3-standard-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 deafb6f35ced54f67c43660a489687fd731347aa..7e77396d6113bad620fef6b5a81a56870f8d9758 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,3 +1,3 @@
 LABELS=centos7-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 64c603d3349462ef2460a0fd18a3dafdb559cc53..b53355dd4bc31404afc6474876b489d79f7fbe7f 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 - 20200901-060217.896
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
 HARDWARE_ID=v3-standard-2
 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 97156d9e490851de685076dd0b467498677a2fdb..91e05fce3078d34f926e0809209f506a3acc8188 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -77,7 +77,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "v3-standard-2"
@@ -185,7 +185,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "v3-standard-2"
@@ -493,7 +493,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "v3-standard-2"
@@ -604,7 +604,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "v3-standard-2"
@@ -913,7 +913,7 @@
 
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     docker_system_count: "1"
     docker_system_flavor: "v3-standard-2"
@@ -1047,7 +1047,7 @@
 
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
@@ -1477,7 +1477,7 @@
 
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"