Update Jenkins cloud configs

Updating Jenkins cloud templates to reflect sandbox and production.
Removing the old cloud configs that are no longer in use.

Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Change-Id: I40ff4b74d87b8d16da84197d24cd280479fd9668

23 files changed, 20 insertions, 60 deletions

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg
index 3502922d..4f350de7 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191215-024720.020
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
 LABELS=centos7-builder-2c-2g
 HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg
index 7f269d69..916f7471 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191215-024720.020
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg
index dfb2d1cf..b175a015 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191215-024720.020
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
 LABELS=centos7-builder-8c-8g
 HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg
new file mode 100644
index 00000000..8c7857c0
--- /dev/null
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg
@@ -0,0 +1,4 @@
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200405-094320.230
+LABELS=centos7-docker-2c-2g
+HARDWARE_ID=v2-standard-2
+VOLUME_SIZE=10
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg
index 4b215e56..51bd100c 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200105-094324.141
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200405-094320.230
 LABELS=centos7-docker-4c-4g
 HARDWARE_ID=v2-standard-4
 VOLUME_SIZE=10
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
index e8d47dd6..1fd156cc 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
@@ -6,7 +6,7 @@ CLOUD_ZONE=ca-ymq-1
 OS_CLOUD=vexci
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191215-024720.020
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200315-024729.521
 HARDWARE_ID=v2-highcpu-2
 NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03
 USER_DATA_ID=jenkins-init-system
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg
index 59744901..2b95de24 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191119-214815.550
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109
 LABELS=ubuntu1604-builder-2c-2g
 HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg
index b9ffedbf..56a4756c 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191119-214815.550
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109
 LABELS=ubuntu1604-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg
index 7d377054..47295370 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191119-214815.550
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109
 LABELS=ubuntu1604-builder-8c-32g
 HARDWARE_ID=v2-highcpu-32
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg
index 8bda8834..3ef5666a 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191119-214815.550
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109
 LABELS=ubuntu1604-builder-8c-8g
 HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg
index 09d65e0f..c299aecc 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190810-225705.438
-LABELS=centos7-docker-4c-4g
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200510-225624.603
+LABELS=ubuntu1604-docker-4c-4g
 HARDWARE_ID=v2-standard-4
 VOLUME_SIZE=10
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg
index 2bb05981..c2c9c654 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20191226-084321.945
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173
 LABELS=ubuntu1804-builder-2c-2g.cfg
 HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg
index 8e24bd22..6ac6d7db 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20191226-084321.945
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173
 LABELS=ubuntu1804-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-32g.cfg
deleted file mode 100644
index 883f7d5a..00000000
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-32g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20191226-084321.945
-LABELS=ubuntu1804-builder-8c-32g
-HARDWARE_ID=v2-highcpu-32
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg
index bcc7fd19..5ced41c2 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20191226-084321.945
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173
 LABELS=ubuntu1804-builder-8c-8g.cfg
 HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-arm64-4c-4g.cfg
deleted file mode 100644
index 4f4cfa7d..00000000
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-arm64-4c-4g.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - arm64 - 20190820-203918.821
-LABELS=ubuntu1804-builder-arm64-4c-4g
-HARDWARE_ID=v2-highcpu-4
-VOLUME_SIZE=10
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g
index c46c1ecf..8490e31c 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-arm64-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g
@@ -1,4 +1,5 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20191209-185146.016
-LABELS=ubuntu1804-docker-arm64-4c-4g
+LABELS=ubuntu1804arm-docker-4c-4g
 HARDWARE_ID=v2-standard-4
 VOLUME_SIZE=10
+
diff --git a/jenkins-config/clouds/openstack/FDIOVEX/centos7-basebuild-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX/centos7-basebuild-4c-4g.cfg
deleted file mode 100644
index 3348ca5d..00000000
--- a/jenkins-config/clouds/openstack/FDIOVEX/centos7-basebuild-4c-4g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=CentOS 7 - basebuild - 20170322-1518
-LABELS=centos7-basebuild-4c-4g
-HARDWARE_ID=v1-standard-4
diff --git a/jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg
deleted file mode 100644
index a21118e4..00000000
--- a/jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Cloud Configuration
-CLOUD_CREDENTIAL_ID=vexx-fdio
-CLOUD_URL=https://auth.vexxhost.net/v3/
-CLOUD_IGNORE_SSL=false
-CLOUD_ZONE=ca-ymq-1
-OS_CLOUD=vex
-
-# Default Template Configuration
-IMAGE_NAME=CentOS 7 - basebuild - 20170322-1518
-HARDWARE_ID=v1-standard-1
-NETWORK_ID=1b9e78ec-b49b-4ebe-9e16-0ae9baddb754
-USER_DATA_ID=jenkins-init-system
-INSTANCE_CAP=20
-SANDBOX_CAP=5
-FLOATING_IP_POOL=
-SECURITY_GROUPS=default
-AVAILABILITY_ZONE=ca-ymq-2
-STARTUP_TIMEOUT=600000
-KEY_PAIR_NAME=jenkins
-NUM_EXECUTORS=1
-JVM_OPTIONS=
-FS_ROOT=/w
-RETENTION_TIME=1
diff --git a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1404-basebuild-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1404-basebuild-4c-4g.cfg
deleted file mode 100644
index abb6cae9..00000000
--- a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1404-basebuild-4c-4g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 14.04 - basebuild - 20170331-2223
-LABELS=ubuntu1404-basebuild-4c-4g
-HARDWARE_ID=v1-standard-4
diff --git a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-4c-4g.cfg
deleted file mode 100644
index 9744affe..00000000
--- a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-4c-4g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20180406-1741
-LABELS=ubuntu1604-basebuild-4c-4g
-HARDWARE_ID=v1-standard-4
diff --git a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-8c-32g.cfg b/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-8c-32g.cfg
deleted file mode 100644
index 2d0ec0be..00000000
--- a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1604-basebuild-8c-32g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171103-2145
-LABELS=ubuntu1604-basebuild-8c-32g
-HARDWARE_ID=v2-standard-8
diff --git a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1804-basebuild-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1804-basebuild-4c-4g.cfg
deleted file mode 100644
index 5b588572..00000000
--- a/jenkins-config/clouds/openstack/FDIOVEX/ubuntu1804-basebuild-4c-4g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 18.04 - basebuild - 20180523-2109
-LABELS=ubuntu1804-basebuild-4c-4g
-HARDWARE_ID=v2-highcpu-4