From 046d5f8049d60a1f30dc28827b7c797310642c58 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 2 Apr 2019 05:12:32 +1000 Subject: [PATCH] Update CentOS7 builder to the latest - The image is built with the latest changes to pull in the openjdk11 from the upstream repos. Change-Id: If2006b2e3d41d314423474df4750e348f7ecd576 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 3a1cdc1b8..c9c9bc960 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 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 d91617394..54274d857 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 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 9f4357507..75089bdc0 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 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 b1fdbea47..cb7e489d7 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 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 bcad551f9..2e47552b6 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 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 2957d7bdb..9daeda90e 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 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 4f6a55303..a6473e259 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 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 b2dbd987f..9fbf9ddfd 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 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 9833ce6f6..4ecf1e2a3 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 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 03a1a5d93..f978c81a8 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 HARDWARE_ID=odl-highcpu-8 diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index 3b2dfb250..53ecb2f55 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 - 20181010-215635.956 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621 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 ef6157e41..9bd6aa31f 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 - 20181010-215635.956' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366' @@ -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 - 20181010-215635.956' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366' @@ -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 - 20181010-215635.956' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366' @@ -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 - 20181010-215635.956' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366' @@ -901,7 +901,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621' 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 - 20181010-215635.956' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621' 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 - 20181010-215635.956' + odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460' -- 2.36.6