From a31eef10dbefc9acfdbc725d9cd23e7d3e3cc89e Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sat, 24 Aug 2019 08:33:03 +0530 Subject: [PATCH] Update CentOS 7 buider images - Pull in the latest updates for openjdk11 and openjdk8 Change-Id: I85667b1d4151d896dbf1f81d965afdddcba8d9e8 Signed-off-by: Anil Belur --- .../clouds/openstack/odlvex/centos7-apex-2c-2g.cfg | 2 +- .../odlvex/centos7-autorelease-4c-16g.cfg | 2 +- .../odlvex/centos7-autorelease-8c-32g.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 +++++++------- 12 files changed, 18 insertions(+), 18 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 55af79bb7..c5b80ae1d 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 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 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 a71bd7c2f..0b54fca6a 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 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 VOLUME_SIZE=150 HARDWARE_ID=odl-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg index 85f7142b3..c75235ead 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 VOLUME_SIZE=150 HARDWARE_ID=odl-standard-8 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 ec6b9ee61..6386e8e5d 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 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 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 69eeab3c6..b1053fb73 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 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 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 2fa01ba85..9cce477f5 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 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 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 0517530c3..4868abb78 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 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 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 97bf3c8f7..63b89782e 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 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 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 2f2e1f51d..e1a8c0da5 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 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 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 f1b545c9a..4126793d2 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 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 HARDWARE_ID=odl-highcpu-8 diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index be906a765..94b171e05 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 - 20190723-062027.340 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740 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 22c394302..010a1c4e8 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 - 20190723-062027.340' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240' @@ -184,7 +184,7 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190723-062027.340' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240' @@ -487,7 +487,7 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190723-062027.340' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240' @@ -596,7 +596,7 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190723-062027.340' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240' @@ -901,7 +901,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190723-062027.340' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740' docker_system_count: 1 docker_system_flavor: 'odl-standard-1' docker_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035' @@ -1033,7 +1033,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190723-062027.340' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460' @@ -1445,7 +1445,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190723-062027.340' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460' -- 2.36.6