From 208d359ce3bb05669657bbab4c718720e9dc8900 Mon Sep 17 00:00:00 2001
From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Wed, 5 Aug 2020 16:19:39 -0700
Subject: [PATCH] Update cloud images to use a volume and v2 flavors

Change-Id: Ife2ba1f36406a39a9c60d4a13ffed125d13825c7
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---
 jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg       | 3 ++-
 jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg       | 1 +
 jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg      | 3 ++-
 jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg      | 1 +
 jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg       | 1 +
 jenkins-config/clouds/openstack/cattle/cloud.cfg                       | 3 ++-
 jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg    | 3 ++-
 jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg     | 1 +
 jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-16g.cfg    | 1 +
 .../clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-16g.cfg         | 1 +
 .../clouds/openstack/cattle/ubuntu1804-docker-arm64-8c-8g.cfg          | 1 +
 jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg      | 3 ++-
 12 files changed, 17 insertions(+), 5 deletions(-)

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 dd16cf0..47728fa 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v2-highcpu-1
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg
index 6ed2429..94547b0 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133
 HARDWARE_ID=v2-standard-2
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg
index 3fccd4a..e929b4d 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133
-HARDWARE_ID=v1-standard-16
+HARDWARE_ID=v2-standard-4
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg
index 17acbe1..a732844 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133
 HARDWARE_ID=v2-highcpu-32
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg
index fb8a055..a519670 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133
 HARDWARE_ID=v2-highcpu-8
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index f0d234d..b682e90 100644
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -6,7 +6,7 @@ CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v2-highcpu-1
 NETWORK_ID=e84c8d94-1d74-4593-b24f-9a091cd3b9bf
 USER_DATA_ID=jenkins-init-script
 INSTANCE_CAP=10
@@ -20,3 +20,4 @@ NUM_EXECUTORS=1
 JVM_OPTIONS=
 FS_ROOT=/w
 RETENTION_TIME=0
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
index e3fe26a..0a6d036 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20181004-095408.110
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v2-highcpu-1
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
index 9dbb8b3..b37a9f9 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190110-225527.869
 HARDWARE_ID=v2-highcpu-8
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-16g.cfg
index 1dc31f7..ab1c928 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-16g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20190706-130528.514
 HARDWARE_ID=v2-standard-4
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-16g.cfg
index 36edfd3..4d289b5 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-16g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20190804-002512.777
 HARDWARE_ID=v2-standard-4
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-8c-8g.cfg
index 1175316..d783d42 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-8c-8g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20190804-002512.777
 HARDWARE_ID=v2-highcpu-8
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg
index b17fdfc..761c96f 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg
@@ -1,2 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20191207-002613.424
-HARDWARE_ID=v2-highcpu-32
\ No newline at end of file
+HARDWARE_ID=v2-highcpu-32
+VOLUME_SIZE=20
-- 
2.16.6