From d4872b0e50dfd09f510464179e0071eaa3f10ca9 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 3 Aug 2018 16:10:45 -0400 Subject: [PATCH] Update builder image to pull in plantuml Plant UML is needed by MD-SAL to generate their docs. Change-Id: I042b03cae3ded65844f577de7210751b2f787248 Signed-off-by: Thanh Ha --- .../clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg | 2 +- .../clouds/openstack/odlvex/centos7-autorelease-8c-32g.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 +- jjb/defaults.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) 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 d5c5457954..eef00fc3c0 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 - 20180723-235310.638 +IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782 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 5d9f1e2a0c..6b6e795018 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 - 20180723-235310.638 +IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782 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 d60027871a..bfba06ad33 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 - 20180723-235310.638 +IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782 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 1bf7d23eb4..801537908c 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 - 20180723-235310.638 +IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782 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 6fd4f01d75..b427a79085 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 - 20180723-235310.638 +IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782 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 98803c7f79..98c246af22 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 - 20180723-235310.638 +IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782 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 a38d6e99d1..f40f2d88bb 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 - 20180723-235310.638 +IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782 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 ffa9d6c7be..e943f33b7b 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 - 20180723-235310.638 +IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782 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 ce2a9c7e37..4ffea7f224 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 - 20180723-235310.638 +IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782 HARDWARE_ID=odl-highcpu-8 diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index 128f4a983c..93e04006a6 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 - 20180723-235310.638 +IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782 HARDWARE_ID=v1-standard-1 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229 USER_DATA_ID=jenkins-init-script diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index c3f2ad48d7..d63f8986bb 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -96,7 +96,7 @@ docker_system_image: ZZCI - CentOS 7 - docker - 20180723-235456.035 odl_system_count: 1 odl_system_flavor: odl-highcpu-4 - odl_system_image: ZZCI - CentOS 7 - builder - 20180723-235310.638 + odl_system_image: ZZCI - CentOS 7 - builder - 20180802-220823.782 openstack_system_count: 1 openstack_system_flavor: odl-standard-4 openstack_system_image: ZZCI - CentOS 7 - devstack - 20180723-235345.727 -- 2.36.6