From f10e820d06cd2099f9ca669326fbc3e7d9f8575f Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 16 Feb 2021 20:56:13 +1000 Subject: [PATCH] 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 --- .../clouds/openstack/odlvex/centos7-builder-2c-1g.cfg | 2 +- .../clouds/openstack/odlvex/centos8-builder-2c-1g.cfg | 2 +- jenkins-config/clouds/openstack/odlvex/cloud.cfg | 2 +- .../clouds/openstack/odlvex/queue-disttest-2c-1g.cfg | 2 +- .../clouds/openstack/odlvex/queue-intque-2c-1g.cfg | 2 +- openstack-hot/csit-2-instance-type.yaml | 4 ++-- openstack-hot/csit-3-instance-type.yaml | 6 +++--- openstack-hot/csit-4-instance-type.yaml | 8 ++++---- openstack-hot/generic-server.yaml | 2 +- packer/templates/devstack-pre-pip-rocky.json | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) 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 ba42d6318..d49cab9ab 100644 --- 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 5d522f969..b33cc895f 100644 --- 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 866102eca..64c603d33 100644 --- 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 e66c52e9f..597ca0636 100644 --- 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 f4f2a9c7b..457bd62ee 100644 --- 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 b601d9c2f..e10804731 100644 --- 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 421b3ff2f..fd5ae1f53 100644 --- 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 e7ca5a265..33e16c6a6 100644 --- 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 223e33b78..15e834ad5 100644 --- 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 c976afc23..1e6ba9eac 100644 --- 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" } -- 2.36.6