From 63ce932398b0418bb9b55faacd23deda7e527a45 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 16 Feb 2021 23:15:37 +1000 Subject: [PATCH] Migrate jobs from odl-highcpu-* flavors to v3 v3 flavors guarantees jobs spin on newer hardware that are faster and cost-efficient than the v2 flavors. Signed-off-by: Anil Belur Change-Id: I242a05cc8222b62ac46e7f22195d4767bed29865 --- .../odlvex/centos7-builder-2c-2g.cfg | 2 +- .../odlvex/centos7-builder-4c-4g.cfg | 2 +- .../odlvex/centos7-builder-8c-8g.cfg | 2 +- .../openstack/odlvex/centos7-docker-2c-2g.cfg | 2 +- .../openstack/odlvex/centos7-docker-4c-4g.cfg | 2 +- .../odlvex/centos8-builder-2c-2g.cfg | 2 +- .../odlvex/centos8-builder-4c-4g.cfg | 2 +- .../odlvex/centos8-builder-8c-8g.cfg | 2 +- .../odlvex/ubuntu1804-docker-2c-2g.cfg | 2 +- .../odlvex/ubuntu1804-docker-4c-4g.cfg | 2 +- jjb/integration/integration-templates.yaml | 26 +++++++++---------- .../netvirt-csit-hwvtep-openstack.yaml | 24 ++++++++--------- .../netvirt-csit-multi-openstack-upgrade.yaml | 18 ++++++------- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 8 +++--- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg index ceb308bef..3fe778c1f 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-2c-2g IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896 -HARDWARE_ID=odl-highcpu-2 +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg index 8efef87bc..7c7ce78b7 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-4c-4g IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896 -HARDWARE_ID=odl-highcpu-4 +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg index d9956ccd9..deafb6f35 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-8c-8g IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896 -HARDWARE_ID=odl-highcpu-8 +HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg index dbbd4c6df..015ee25b9 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-docker-2c-2g IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955 -HARDWARE_ID=odl-highcpu-2 +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg index 62076713e..44ea9fbc5 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-docker-4c-4g IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955 -HARDWARE_ID=odl-highcpu-4 +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg index b4bab15d3..582d64324 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-2c-2g IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907 -HARDWARE_ID=odl-highcpu-2 +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg index ceb313d53..1ea7e05f8 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-4c-4g IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907 -HARDWARE_ID=odl-highcpu-4 +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg index 9e1b653dc..5c82920a2 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos8-builder-8c-8g IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200901-040201.907 -HARDWARE_ID=odl-highcpu-8 +HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg index d4688a5a2..1264de0c4 100644 --- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=ubuntu1804-docker-2c-2g IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200901-040308.994 -HARDWARE_ID=odl-highcpu-2 +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg index d9aa13abd..2d9e5e046 100644 --- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=ubuntu1804-docker-4c-4g IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200901-040308.994 -HARDWARE_ID=odl-highcpu-4 +HARDWARE_ID=v3-standard-4 diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 5dd500dd1..2f467ab1b 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -76,11 +76,11 @@ openstack-heat-template: csit-2-instance-type.yaml openstack-heat-template-dir: openstack-hot - odl_system_flavor: "odl-highcpu-4" + odl_system_flavor: "v3-standard-4" odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" controller-max-mem: "2048m" tools_system_count: "1" - tools_system_flavor: "odl-highcpu-2" + tools_system_flavor: "v3-standard-2" tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743" ##################### @@ -184,11 +184,11 @@ openstack-heat-template: csit-2-instance-type.yaml openstack-heat-template-dir: openstack-hot - odl_system_flavor: "odl-highcpu-4" + odl_system_flavor: "v3-standard-4" odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" controller-max-mem: "2048m" tools_system_count: "1" - tools_system_flavor: "odl-highcpu-2" + tools_system_flavor: "v3-standard-2" tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743" ##################### @@ -492,11 +492,11 @@ openstack-heat-template: csit-2-instance-type.yaml openstack-heat-template-dir: openstack-hot - odl_system_flavor: "odl-highcpu-4" + odl_system_flavor: "v3-standard-4" odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" controller-max-mem: "2048m" tools_system_count: "1" - tools_system_flavor: "odl-highcpu-2" + tools_system_flavor: "v3-standard-2" tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743" ##################### @@ -603,11 +603,11 @@ openstack-heat-template: csit-2-instance-type.yaml openstack-heat-template-dir: openstack-hot - odl_system_flavor: "odl-highcpu-4" + odl_system_flavor: "v3-standard-4" odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" controller-max-mem: "2048m" tools_system_count: "1" - tools_system_flavor: "odl-highcpu-2" + tools_system_flavor: "v3-standard-2" tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743" ##################### @@ -912,7 +912,7 @@ openstack-heat-template-dir: openstack-hot odl_system_count: 1 - odl_system_flavor: "odl-highcpu-4" + odl_system_flavor: "v3-standard-4" odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" controller-max-mem: "2048m" docker_system_count: "1" @@ -1046,7 +1046,7 @@ openstack-heat-template-dir: openstack-hot odl_system_count: 1 - odl_system_flavor: "odl-highcpu-4" + odl_system_flavor: "v3-standard-4" odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" controller-max-mem: "2048m" openstack_system_count: 1 @@ -1056,7 +1056,7 @@ openstack_system2_flavor: "odl-standard-1" openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669" tools_system_count: 1 - tools_system_flavor: "odl-highcpu-2" + tools_system_flavor: "v3-standard-2" tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743" ##################### @@ -1476,7 +1476,7 @@ openstack-heat-template-dir: openstack-hot odl_system_count: 1 - odl_system_flavor: "odl-highcpu-4" + odl_system_flavor: "v3-standard-4" odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" controller-max-mem: "2048m" openstack_system_count: 1 @@ -1486,7 +1486,7 @@ openstack_system2_flavor: "odl-standard-1" openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669" tools_system_count: 1 - tools_system_flavor: "odl-highcpu-2" + tools_system_flavor: "v3-standard-2" tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743" ##################### diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index d02cb7465..5b3b2a2e4 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -12,9 +12,9 @@ enable-openstack-services: "placement-api,l2gw-plugin" enable-openstack-compute-services: "placement-client" security-group-mode: "stateful" - odl_system_flavor: odl-highcpu-2 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 + odl_system_flavor: v3-standard-2 + openstack_system_flavor: v3-standard-8 + openstack_system2_flavor: v3-standard-4 tools_system_count: 2 tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200813-034124.624 os-cmb-cnt: 0 @@ -63,9 +63,9 @@ enable-openstack-services: "placement-api,l2gw-plugin" enable-openstack-compute-services: "placement-client" security-group-mode: "stateful" - odl_system_flavor: odl-highcpu-2 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 + odl_system_flavor: v3-standard-2 + openstack_system_flavor: v3-standard-8 + openstack_system2_flavor: v3-standard-4 tools_system_count: 2 tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200813-034124.624 os-cmb-cnt: 0 @@ -114,9 +114,9 @@ enable-openstack-services: "placement-api,l2gw-plugin" enable-openstack-compute-services: "placement-client" security-group-mode: "stateful" - odl_system_flavor: odl-highcpu-2 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 + odl_system_flavor: v3-standard-2 + openstack_system_flavor: v3-standard-8 + openstack_system2_flavor: v3-standard-4 tools_system_count: 2 tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200813-034124.624 os-cmb-cnt: 0 @@ -165,9 +165,9 @@ enable-openstack-services: "placement-api,l2gw-plugin" enable-openstack-compute-services: "placement-client" security-group-mode: "stateful" - odl_system_flavor: odl-highcpu-2 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 + odl_system_flavor: v3-standard-2 + openstack_system_flavor: v3-standard-8 + openstack_system2_flavor: v3-standard-4 tools_system_count: 2 tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200813-034124.624 os-cmb-cnt: 0 diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 361635ddb..179dbdc7a 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -17,9 +17,9 @@ enable-openstack-compute-services: "placement-client" security-group-mode: "stateful" group-add-mod-enabled: "true" - odl_system_flavor: odl-highcpu-2 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 + odl_system_flavor: v3-standard-2 + openstack_system_flavor: v3-standard-8 + openstack_system2_flavor: v3-standard-4 os-cmb-cnt: 0 os-ctl-cnt: 1 os-cmp-cnt: 2 @@ -67,9 +67,9 @@ enable-openstack-compute-services: "placement-client" security-group-mode: "stateful" group-add-mod-enabled: "true" - odl_system_flavor: odl-highcpu-2 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 + odl_system_flavor: v3-standard-2 + openstack_system_flavor: v3-standard-8 + openstack_system2_flavor: v3-standard-4 os-cmb-cnt: 0 os-ctl-cnt: 1 os-cmp-cnt: 2 @@ -114,9 +114,9 @@ enable-openstack-compute-services: "placement-client" security-group-mode: "stateful" group-add-mod-enabled: "true" - odl_system_flavor: odl-highcpu-2 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 + odl_system_flavor: v3-standard-2 + openstack_system_flavor: v3-standard-8 + openstack_system2_flavor: v3-standard-4 os-cmb-cnt: 0 os-ctl-cnt: 1 os-cmp-cnt: 2 diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index f842b4c62..c80780b6a 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -13,9 +13,9 @@ enable-openstack-services: "placement-api,tempest" enable-openstack-compute-services: "placement-client" security-group-mode: "stateful" - odl_system_flavor: odl-highcpu-2 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: v3-standard-4 + odl_system_flavor: v3-standard-2 + openstack_system_flavor: v3-standard-8 + openstack_system2_flavor: odl-standard-4 tools_system_count: 0 os-cmb-cnt: 0 os-ctl-cnt: 1 @@ -182,7 +182,7 @@ security-group-mode: "stateful" odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: v3-standard-4 + openstack_system2_flavor: odl-standard-4 tools_system_count: 0 os-cmb-cnt: 0 os-ctl-cnt: 1 -- 2.36.6