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 <abelur@linuxfoundation.org>
Change-Id: I242a05cc8222b62ac46e7f22195d4767bed29865

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 ceb308bef888d9868556722ecb2974746e15e254..3fe778c1f7cbc14b9c726057749e5a104d2d12e5 100644 (file)
--- 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 8efef87bca169f4218ab842a81b5ec70e7518449..7c7ce78b71c09b1ad01f7430272b4a6cb906b0a4 100644 (file)
--- 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 d9956ccd934004ba12637a0b9f3d7a1cb9ccef61..deafb6f35ced54f67c43660a489687fd731347aa 100644 (file)
--- 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 dbbd4c6df0c5f7ab504f078a88ce582f08f111df..015ee25b9ba9a2f86fd81b33393b753cf3f42fc2 100644 (file)
--- 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 62076713e944ad67b24d87e71f9eef58fa8988c5..44ea9fbc5af2e5689e1b51265ae568098a4fe606 100644 (file)
--- 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 b4bab15d3ff91e9afe80c259f310c39be72b4f90..582d64324cba3a5e603f7c6ed209899649d17018 100644 (file)
--- 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 ceb313d53f4e9c5967283d64cf2c974130d5abb9..1ea7e05f8e0ae8f6e53e33d66e173c1f5457f730 100644 (file)
--- 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 9e1b653dcae9a9c268b6a12993b7061b98218665..5c82920a205c3d054fc9a76778b58d3a9be09850 100644 (file)
--- 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 d4688a5a2a521393780b68ed18bf82df7621bd80..1264de0c44ae97620fbefdfd7defd53ea1c4063a 100644 (file)
--- 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 d9aa13abd106a99f9ffed6bad91661436e1d08d2..2d9e5e0464f68baf67f186d1364460bb3c09e94e 100644 (file)
--- 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 5dd500dd13ec214b76287894371c56fb3faea001..2f467ab1b9d970cdc5fd39d20a189980d5be8e84 100644 (file)
--- 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 d02cb7465e9f348537b6a6db7e5dabad21140651..5b3b2a2e4430de53acfda8a8861906e48cce7ec3 100644 (file)
--- 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 361635ddb82fa2e802419ae09286350357f5bf05..179dbdc7a740e6e5b9626249f4f338ce2ca88b2f 100644 (file)
--- 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 f842b4c62a4b4984b624ab83c2a1355e8eba2dca..c80780b6a6507389980fd2d4a47a3e2bb13a520f 100644 (file)
--- 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