From d394cae71f06924c80109424b237b796467e24ca Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 12 Dec 2019 09:40:07 +0100 Subject: [PATCH] Update builder images to 20191201-060129.829 This upgrades the builder images, hopefully picking up JDK-11.0.5. Change-Id: If063f0b172c8ef392e2e10031b3ab884c6b8b85f 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 91bf577e9..c12730a3e 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 - 20190924-232354.381 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829 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 d1e850b40..579358eaf 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 - 20190924-232354.381 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829 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 b72807536..10b142676 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 - 20190924-232354.381 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829 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 cfeca9e32..a320e0374 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 - 20190924-232354.381 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829 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 852c00632..16486e4d8 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 - 20190924-232354.381 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829 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 59305614a..a0ac9baf1 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 - 20190924-232354.381 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829 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 56884e44d..031470f4d 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 - 20190924-232354.381 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829 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 542a68ef5..0d88ab7ca 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 - 20190924-232354.381 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829 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 389dc2e85..f2ae5bf56 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 - 20190924-232354.381 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829 HARDWARE_ID=odl-highcpu-8 diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index 925456dde..8d72a9872 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 - 20190924-232354.381 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829 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 85e764a92..f0165cf61 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 - 20190924-232354.381' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' @@ -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 - 20190924-232354.381' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' @@ -491,7 +491,7 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' @@ -601,7 +601,7 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' @@ -908,7 +908,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' docker_system_count: 1 docker_system_flavor: 'odl-standard-1' docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840' @@ -1041,7 +1041,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' @@ -1455,7 +1455,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' -- 2.36.6