Merge "Move clamp job to 16g node"

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 a5b4bd9..f850632 100644 (file)
--- 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 209cb0e..9d757fd 100644 (file)
--- 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 edbfd34..73ebed0 100644 (file)
--- 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 791a9b6..f84207f 100644 (file)
--- 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
+IMAGE_NAME=CentOS 7 - redis -  - 50880808-8011
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v2-highcpu-4
+VOLUME_SIZE=50

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 2b0ca12..5695a77 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -5,7 +5,8 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180601-1002
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
+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 37a375a..817e681 100644 (file)
--- 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 de51c46..a8d9328 100644 (file)
--- 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 eb4c166..5f1844a 100644 (file)
--- 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 0743989..dc4d62f 100644 (file)
--- 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 5e19001..e49f0a6 100644 (file)
--- 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 5ece275..90de5db 100644 (file)
--- 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 3d474c9..a997a04 100644 (file)
--- 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 d69e209..1c707ac 100644 (file)
--- 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 6d2f06e..c8c65cf 100644 (file)
--- 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
+IMAGE_NAME=Ubuntu 18.04 - memcached -  - 120780707-7003
 LABELS=ubuntu1804-memcached-4c-4g
 HARDWARE_ID=v2-highcpu-4
+VOLUME_SIZE=20