From 160b2628128b60787d0bd66f61dd5d489ed90d28 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 26 Jun 2020 13:41:17 -0400 Subject: [PATCH 1/1] 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 --- .../clouds/openstack/odlvex/centos7-apex-2c-2g.cfg | 2 +- .../openstack/odlvex/centos7-builder-2c-1g.cfg | 2 +- .../openstack/odlvex/centos7-builder-2c-2g.cfg | 2 +- .../openstack/odlvex/centos7-builder-2c-8g.cfg | 2 +- .../openstack/odlvex/centos7-builder-4c-16g.cfg | 2 +- .../openstack/odlvex/centos7-builder-4c-4g.cfg | 2 +- .../openstack/odlvex/centos7-builder-8c-8g.cfg | 2 +- jenkins-config/clouds/openstack/odlvex/cloud.cfg | 2 +- jjb/integration/integration-templates.yaml | 14 +++++++------- 9 files changed, 15 insertions(+), 15 deletions(-) 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 3813ad5a2..43c990986 100644 --- 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 b4f4f35f2..c35726c18 100644 --- 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 b09e2cde7..b00bf37da 100644 --- 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 0aae588cd..dbff69d2b 100644 --- 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 af168aa78..1bbc7f7aa 100644 --- 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 a6944e97b..9a56b8669 100644 --- 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 30c0edcd4..1ea522cac 100644 --- 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 8eea199eb..95909a08d 100644 --- 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 422f3b160..9e4c418ac 100644 --- 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' -- 2.36.6