From b3f4bda3beecbe10dd60c9200eb0131986803f2e Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Mon, 1 Jun 2020 13:50:40 +1000 Subject: [PATCH] Update CentOS 7 images to the latest Change-Id: I0ba816afca8a7d1b4035a4481804eb09b49efc30 Signed-off-by: Anil Belur Signed-off-by: Robert Varga --- .../clouds/openstack/odlvex/centos7-apex-2c-2g.cfg | 2 +- .../odlvex/centos7-autorelease-4c-16g.cfg | 2 +- .../openstack/odlvex/centos7-autorelease-8c-8g.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 +++++++------- 11 files changed, 17 insertions(+), 17 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 74f75f97a..3813ad5a2 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 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204 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 e7cc9da4e..9859e381c 100644 --- 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 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204 VOLUME_SIZE=150 HARDWARE_ID=odl-standard-4 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 179dad51d..6002366ce 100644 --- 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 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204 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 29e1f9de0..b4f4f35f2 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 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204 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 ae9459213..b09e2cde7 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 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204 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 0ce20babc..0aae588cd 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 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204 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 485f9af52..af168aa78 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 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204 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 f5cc893f3..a6944e97b 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 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204 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 7c70aba49..30c0edcd4 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 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204 HARDWARE_ID=odl-highcpu-8 diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index cc3fc6521..8eea199eb 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 - 20200421-202608.246 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204 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 84f8fc677..021f15b49 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 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204' 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 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204' 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 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204' 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 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204' 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 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204' 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 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204' controller-max-mem: '2048m' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' @@ -1473,7 +1473,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204' controller-max-mem: '2048m' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' -- 2.36.6