Migrate jobs from odl-standard-* 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: I1644cd43d97da5b292503546b9d577b2f4a52402

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
index 46362f6999f7a486dad5d7151cdaad2bee66a37e..a4ef1dc75b15f2287e920d06c61a9cc49edf0450 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-docker-1c-4g
 IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955
-HARDWARE_ID=odl-standard-1
+HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
index ebcbaf1a14be32bfd7ed841bbddfe837e9493a5a..a093c6ecb62401e79d0d058f155e32a16d57bc4a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=ubuntu1604-mininet-ovs-25-1c-4g
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - x86_64 - 20200813-044931.688
-HARDWARE_ID=odl-standard-1
+HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg
index b024872dd975a291d26aa5b5038b021aab80d0b5..2021e21ec88381c5817fbf15725d3a7715a12929 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=ubuntu1604-mininet-ovs-28-1c-4g
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743
-HARDWARE_ID=odl-standard-1
+HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg
index 3596aed2d295a024afa5f8d4c180e124a77e6ff0..5fa2ec4982b8fa89f05c7ef671c785b1189e95cf 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-mininet-ovs-25-1c-4g
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200813-035525.790
-HARDWARE_ID=odl-standard-1
+HARDWARE_ID=v3-standard-2

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 04561787f95b58043cd7d6daa94e61580bbf88b5..7351c85be45a56a60cc953ecb4fbba75a0f7829f 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -916,7 +916,7 @@
     odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
     controller-max-mem: "2048m"
     docker_system_count: "1"
-    docker_system_flavor: "odl-standard-1"
+    docker_system_flavor: "v3-standard-2"
     docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955"
 
     #####################
@@ -1053,7 +1053,7 @@
     openstack_system_flavor: "odl-standard-4"
     openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     openstack_system2_count: 0
-    openstack_system2_flavor: "odl-standard-1"
+    openstack_system2_flavor: "v3-standard-2"
     openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     tools_system_count: 1
     tools_system_flavor: "odl-highcpu-2"
@@ -1483,7 +1483,7 @@
     openstack_system_flavor: "odl-standard-4"
     openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     openstack_system2_count: 0
-    openstack_system2_flavor: "odl-standard-1"
+    openstack_system2_flavor: "v3-standard-2"
     openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     tools_system_count: 1
     tools_system_flavor: "odl-highcpu-2"