From a01256fccabb2229f4061b5d81c408552e9f06fd Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Wed, 5 Aug 2020 16:05:56 -0700 Subject: [PATCH] Add volume size for cloud instances The value is now needed to be defined with the latest cloud provider upgrades. Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall Change-Id: Iad3cb5ca9763fe74a9086b37a7ca2b86fb7d175f --- jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg | 1 + jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg | 1 + jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg | 1 + jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg | 1 + jenkins-config/clouds/openstack/cattle/cloud.cfg | 1 + jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg | 1 + 14 files changed, 14 insertions(+) diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg index a5b4bd9d0..f85063238 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 LABELS=centos7-builder-2c-1g HARDWARE_ID=v2-highcpu-2 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg index 209cb0e97..9d757fded 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 LABELS=centos7-builder-4c-4g HARDWARE_ID=v2-highcpu-4 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg index edbfd3426..73ebed052 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200224-195343.324 LABELS=centos7-docker-8c-8g HARDWARE_ID=v2-highcpu-8 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg index 791a9b697..ac97205cd 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=CentOS 7 - redis - - 70180101-1009 LABELS=centos7-redis-4c-4g HARDWARE_ID=v2-highcpu-4 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index 2b0ca1245..212be7291 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -6,6 +6,7 @@ CLOUD_ZONE=ca-ymq-1 # Default Template Configuration IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180601-1002 +VOLUME_SIZE=20 HARDWARE_ID=v1-standard-1 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf USER_DATA_ID=jenkins-init-script diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg index 37a375a0a..817e6812f 100644 --- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg @@ -4,3 +4,4 @@ HARDWARE_ID=v2-highcpu-4 INSTANCE_CAP=1 NUM_EXECUTORS=4 RETENTION_TIME=4320 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg index de51c46fd..a8d9328a2 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200720-175313.316 LABELS=ubuntu1804-builder-4c-4g HARDWARE_ID=v2-highcpu-4 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg index eb4c1661e..5f1844a82 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181 LABELS=ubuntu1804-docker-8c-16g HARDWARE_ID=v2-highcpu-16 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg index 0743989b7..dc4d62f84 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181 LABELS=ubuntu1804-docker-8c-8g HARDWARE_ID=v2-highcpu-8 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg index 5e1900178..e49f0a689 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944 LABELS=ubuntu1804-docker-arm64-4c-2g HARDWARE_ID=lf-standard-2 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg index 5ece27518..90de5db54 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944 LABELS=ubuntu1804-docker-arm64-4c-4g HARDWARE_ID=lf-standard-4 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg index 3d474c9bd..a997a04e4 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181 LABELS=ubuntu1804-docker-v1-8c-8g HARDWARE_ID=v1-standard-8 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg index d69e20940..1c707acd2 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20200506-233718.921 LABELS=ubuntu1804-helm-2c-1g HARDWARE_ID=v2-highcpu-2 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg index 6d2f06e38..cc36fc6af 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=Ubuntu 18.04 - memcached - - 120380303-3010 LABELS=ubuntu1804-memcached-4c-4g HARDWARE_ID=v2-highcpu-4 +VOLUME_SIZE=20 -- 2.16.6