From 8d6ba389ca5cefad278a4ede274be783f160e4a0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 22 Apr 2020 10:18:11 +0200 Subject: [PATCH] Update builder images to 20200421-202608.246 Pick up latest updates, most notably JDK 11.0.6/1.8.0.242. Change-Id: I0442de5017d6ed818bb2d96fbaa3ab4df2e220d3 Signed-off-by: Robert Varga --- jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg | 2 +- .../clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg | 2 +- .../clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg | 2 +- .../clouds/openstack/odlvex/centos7-builder-2c-1g.cfg | 2 +- .../clouds/openstack/odlvex/centos7-builder-2c-2g.cfg | 2 +- .../clouds/openstack/odlvex/centos7-builder-2c-8g.cfg | 2 +- .../clouds/openstack/odlvex/centos7-builder-4c-16g.cfg | 2 +- .../clouds/openstack/odlvex/centos7-builder-4c-4g.cfg | 2 +- .../clouds/openstack/odlvex/centos7-builder-8c-8g.cfg | 2 +- jenkins-config/clouds/openstack/odlvex/cloud.cfg | 2 +- 10 files changed, 10 insertions(+), 10 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 c12730a3e..74f75f97a 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 - 20191201-060129.829 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 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 579358eaf..e7cc9da4e 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 - 20191201-060129.829 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 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 10b142676..179dad51d 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 - 20191201-060129.829 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 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 a320e0374..29e1f9de0 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 - 20191201-060129.829 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 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 16486e4d8..ae9459213 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 - 20191201-060129.829 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 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 a0ac9baf1..0ce20babc 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 - 20191201-060129.829 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 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 031470f4d..485f9af52 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 - 20191201-060129.829 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 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 0d88ab7ca..f5cc893f3 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 - 20191201-060129.829 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 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 f2ae5bf56..7c70aba49 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 - 20191201-060129.829 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 HARDWARE_ID=odl-highcpu-8 diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index 8d72a9872..ff144c6ff 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 - 20191201-060129.829 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246 HARDWARE_ID=v1-standard-1 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229 USER_DATA_ID=jenkins-init-script -- 2.36.6