Merge "Update cloud image CentOS7 builder x86_64"

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 dda4381e7d21b21bb9410a563e4ff0fb7e40ab7e..f74d5457d3a47313b51efb9ea9371a89a6714c2a 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 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 VOLUME_SIZE=100
 HARDWARE_ID=odl-highcpu-2

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 e72391243c6163693c9e535cc409cda30766fcd8..eaee410f3c243f4fa0c1ca4710476bb81762e2d7 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 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 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 accee7db2c1fbe112e67deca25eb4b15e2edf362..745feb18ee533877e6945b79e383e5665bb1cef5 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 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 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 a391dc00e6a879b3d8db861cd52b583473e9e39f..8c7115414848fe81768a6509e89b5b518949a1fe 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 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 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 56a4f863747a66882b211eeec1da209eec5cb955..06f71ea76de7d989e78cfb7bef10460471b85721 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 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 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 dc2aaa756446efa92707659a02cf95fd22a392ab..62decbefe6d531fb279ae355fa13fefa719c0913 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 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 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 cebc67cad69332407cc6cde928ff7260eda5ee08..1b80abc7c519ae500d4b2248faceab0e4eab0574 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 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 HARDWARE_ID=odl-highcpu-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 46a768ca313a96711b3edbb18141f0917cc32c26..4bddff814a1ff1323b006fd37fb390665ab7412b 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 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 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 77b2dae6143ba889f9d0806ca4cee6fbb6772c2a..5aef71e0bb27fe145f5ba128e5e3a1a5d0ad1e82 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: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "odl-highcpu-2"
@@ -185,7 +185,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "odl-highcpu-2"
@@ -492,7 +492,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "odl-highcpu-2"
@@ -603,7 +603,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "odl-highcpu-2"
@@ -912,7 +912,7 @@
 
     odl_system_count: 1
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     docker_system_count: "1"
     docker_system_flavor: "odl-standard-1"
@@ -1046,7 +1046,7 @@
 
     odl_system_count: 1
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "odl-standard-4"
@@ -1476,7 +1476,7 @@
 
     odl_system_count: 1
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "odl-standard-4"