Update builder image to pull in Git version fix

Pull in fix to use a more recent version of Git from
Ia7805e9236b094194bd711fa1dfb610ec0575642.

Change-Id: If2a54533a06889668db1b706ccc8d0d2528c9308
Signed-off-by: Thanh Ha <zxiiro@gmail.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 3813ad5a2c2baeb61a6f0098bdd8e18fcd32896e..43c990986f04f455a9aa2e27d4b181e3f47fec7a 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 - 20200601-154124.204
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838
 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 b4f4f35f2521aa7dce3f4abcd4e78bd6857bac24..c35726c18379ab649273c136b3f6c6c21cb91b1f 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 - 20200601-154124.204
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838
 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 b09e2cde7b6af7e21c4b57b17e095e5e0dd971db..b00bf37dad6049a365ef51f63593276b37d738be 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 - 20200601-154124.204
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838
 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 0aae588cd483d2bd70e1426bf314a7acf3de8d48..dbff69d2b813acd53b96c47582d5fe2acbbc49bc 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 - 20200601-154124.204
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838
 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 af168aa78579e5d4fe5c88f74cf612824ccb25da..1bbc7f7aa6f5505880cf94b25ec8bd3342be60ad 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 - 20200601-154124.204
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838
 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 a6944e97b1401ffe72ed43f6c461e262a0ee73de..9a56b86695e12667a44848cc7b5d85401fd37764 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 - 20200601-154124.204
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838
 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 30c0edcd4beefd2822e6809fd0401b25784d8f55..1ea522cacd0e065a41b71298741c60945902b796 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 - 20200601-154124.204
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838
 HARDWARE_ID=odl-highcpu-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 8eea199eb878eda49b8efc9d0402320bc38e09c0..95909a08d6cfc4255f0911df1c7e7352e050ac83 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 - 20200601-154124.204
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838
 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 422f3b160ec98570a7fa01a0efc0ab27fcdce1d0..9e4c418ac63f11b1121c366bae0158382694def3 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 - 20200601-154124.204'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838'
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
@@ -187,7 +187,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838'
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
@@ -496,7 +496,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838'
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
@@ -608,7 +608,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838'
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
@@ -918,7 +918,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838'
     controller-max-mem: '2048m'
     docker_system_count: '1'
     docker_system_flavor: 'odl-standard-1'
@@ -1053,7 +1053,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838'
     controller-max-mem: '2048m'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
@@ -1481,7 +1481,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838'
     controller-max-mem: '2048m'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'