Migrate jobs from v1-standard-* flavors to v3

v3 flavors guarantees jobs spin on newer hardware that
are faster and cost-efficient than the v2 flavors.

Change-Id: I36aa9842413f9adaff23d6ab2383c0e79c4d4f37
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

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 ba42d6318cf7cba46889d3d2ebeecb03ea2074af..d49cab9ab6a0c575d3bdb147745bbb54575ca2bf 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-1g
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
index 5d522f969952c0e6744a846edd0978d855d204b4..b33cc895f6abf4fc49200eb23000218482d0f029 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-1g
 IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 866102ecab08b8135bd9551c47e51a2cf817cb92..64c603d3349462ef2460a0fd18a3dafdb559cc53 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -6,7 +6,7 @@ CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script
 INSTANCE_CAP=75

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
index e66c52e9f056182c440424ae860662e47b0bcbae..597ca06368c6998b94818b6be831f0e1a6476b1d 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
@@ -1,4 +1,4 @@
 LABELS=queue-disttest-2c-1g
 IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200813-045046.282
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
index f4f2a9c7ba2e97cc5098a9afcdca61eab20d353a..457bd62ee3a8a1ea212785e2e60d8d620ed50d88 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
@@ -1,5 +1,5 @@
 LABELS=queue-intque-2c-1g
 IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200813-045046.282
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2
 INSTANCE_CAP=1
 NUM_EXECUTORS=4

diff --git a/openstack-hot/csit-2-instance-type.yaml b/openstack-hot/csit-2-instance-type.yaml
index b601d9c2f1de645e97ff4e666b5e9c6b51199cdc..e1080473163f2d6ff0ecf81d06415412df6bde09 100644 (file)
--- a/openstack-hot/csit-2-instance-type.yaml
+++ b/openstack-hot/csit-2-instance-type.yaml
@@ -13,7 +13,7 @@ parameters:
     description: Number of VMs for 1st VM type
   vm_0_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 1st VM type
   vm_0_image:
     type: string
@@ -23,7 +23,7 @@ parameters:
     description: Number of VMs for 2nd VM type
   vm_1_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 2nd VM type
   vm_1_image:
     type: string

diff --git a/openstack-hot/csit-3-instance-type.yaml b/openstack-hot/csit-3-instance-type.yaml
index 421b3ff2f97ac2b46cb47d2e1c0531f5498833ee..fd5ae1f538a2eb88930fe39f92dcb0d4206e35c0 100644 (file)
--- a/openstack-hot/csit-3-instance-type.yaml
+++ b/openstack-hot/csit-3-instance-type.yaml
@@ -13,7 +13,7 @@ parameters:
     description: Number of VMs for 1st VM type
   vm_0_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 1st VM type
   vm_0_image:
     type: string
@@ -23,7 +23,7 @@ parameters:
     description: Number of VMs for 2nd VM type
   vm_1_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 2nd VM type
   vm_1_image:
     type: string
@@ -33,7 +33,7 @@ parameters:
     description: Number of VMs for 3rd VM type
   vm_2_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 3rd VM type
   vm_2_image:
     type: string

diff --git a/openstack-hot/csit-4-instance-type.yaml b/openstack-hot/csit-4-instance-type.yaml
index e7ca5a26561afcaa57116de922d15718d47855f2..33e16c6a699ed6b87872f949cc4dd3185d918d47 100644 (file)
--- a/openstack-hot/csit-4-instance-type.yaml
+++ b/openstack-hot/csit-4-instance-type.yaml
@@ -13,7 +13,7 @@ parameters:
     description: Number of VMs for 1st VM type
   vm_0_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 1st VM type
   vm_0_image:
     type: string
@@ -23,7 +23,7 @@ parameters:
     description: Number of VMs for 2nd VM type
   vm_1_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 2nd VM type
   vm_1_image:
     type: string
@@ -33,7 +33,7 @@ parameters:
     description: Number of VMs for 3rd VM type
   vm_2_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 3rd VM type
   vm_2_image:
     type: string
@@ -42,7 +42,7 @@ parameters:
     description: Number of VMs for 3rd VM type
   vm_3_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: Flavor to run instance on for 3rd VM type
   vm_3_image:
     type: string

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index 223e33b78cbe59011dfdea06e5e550602d3e917a..15e834ad5491e0115f2998642fdcdf003af18f32 100644 (file)
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -26,7 +26,7 @@ parameters:
     default: "0"
   vm_flavor:
     type: string
-    default: v1-standard-1
+    default: v3-standard-2
     description: OpenStack Flavor to use
   vm_image:
     type: string

diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json
index c976afc234ec711557e5621659414e0a82372bcf..1e6ba9eacef694b4f20b8ce181f71eeb4a9edaff 100644 (file)
--- a/packer/templates/devstack-pre-pip-rocky.json
+++ b/packer/templates/devstack-pre-pip-rocky.json
@@ -26,7 +26,7 @@
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "flavor": "v1-standard-1",
+      "flavor": "v3-standard-2",
       "metadata": {
         "ci_managed": "yes"
       }