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: I82c6dbe13a3e9c817ef9a9a4fe61f665a2800a4f

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
index a7c9327f170a02edb7f6fc61d8ffe09ab96170ab..e0bcabe0cab165076a891fedc1723140667434de 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-16g
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896
-HARDWARE_ID=odl-standard-4
+HARDWARE_ID=v3-standard-4

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index e4ef3b03a7b1ef1f749c7d0efd3db5be1f698168..1c2b4594cac32544b6a10202b48f19a82db04792 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -48,7 +48,7 @@
       -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4
 
     # Plot Info
     01-plot-title: "Number of generated updates"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index fafc4c483b7fe79bbec699cc0d2dc73d6c651cab..a354549042ddb21ad4ad041cdfa5d07708a5740b 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -47,4 +47,4 @@
       -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index ee582587d41f0c60b8e8a04179f478da38b644f3..d0952e986779bce08ce70a66d14760e072838f05 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -36,4 +36,4 @@
     robot-options: "-v USE_NETCONF_CONNECTOR:False"
 
     # Controller configuration
-    odl_system_flavor: "odl-standard-4"
+    odl_system_flavor: "v3-standard-4"

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 878165f7ef13e13132f72675e6f8b7f67e0220d3..aa6b5cba44ac094eac57f16fd0bda4f5f5df4d1f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -42,4 +42,4 @@
       -v UPDATER_TIMEOUT:900
 
     # Controller configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index e09d091ce5bcf3eecdc722d88f5da3cec5743f44..32907037b2d16a18d8d9baa32c05a65b9d2a7f94 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -36,7 +36,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: "odl-standard-4"
+    odl_system_flavor: "v3-standard-4"
 
     build-timeout: "480"
 

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index db2ddc75afa156815ae90f49a76fdd33e1d4e070..9038123d094dc717fdf7ff6f770749f1f595fbfd 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -37,7 +37,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4
 
     # Plot Info
     01-plot-title: "Performance by structure"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 04561787f95b58043cd7d6daa94e61580bbf88b5..5dd500dd13ec214b76287894371c56fb3faea001 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1050,7 +1050,7 @@
     odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
     controller-max-mem: "2048m"
     openstack_system_count: 1
-    openstack_system_flavor: "odl-standard-4"
+    openstack_system_flavor: "v3-standard-4"
     openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     openstack_system2_count: 0
     openstack_system2_flavor: "odl-standard-1"
@@ -1480,7 +1480,7 @@
     odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
     controller-max-mem: "2048m"
     openstack_system_count: 1
-    openstack_system_flavor: "odl-standard-4"
+    openstack_system_flavor: "v3-standard-4"
     openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     openstack_system2_count: 0
     openstack_system2_flavor: "odl-standard-1"

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index f35425af226b9eb69a74bfedab9d27c7902881a0..94ed4421fc41454167ed60cc331244991350ea44 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -30,7 +30,7 @@
     tools_system_count: 0
 
     # odl system flavor
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4
 
     # Features to install
     install-features: "odl-restconf"

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 46efd0a09d277b009012aec4aac18239da08f700..050e557fbb59a66b18040a9127d2126f25e485e6 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -37,7 +37,7 @@
     robot-options: "-v USE_NETCONF_CONNECTOR:False"
 
     # ODL system configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4
 
 - project:
     name: netconf-csit-scale-max-devices

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index af147a715ab61fc0e2f7b9916d50ed50080c2625..f842b4c62a4b4984b624ab83c2a1355e8eba2dca 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -15,7 +15,7 @@
     security-group-mode: "stateful"
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-standard-4
+    openstack_system2_flavor: v3-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: odl-standard-4
+    openstack_system2_flavor: v3-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 9027fb1b44f8c75cdbf00750dd3d50092ebbb128..d6d6141c26d59a771ff023b9fc51e8e940b0c975 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -29,7 +29,7 @@
           scope: "only"
 
     # Job images
-    odl_system_flavor: "odl-standard-4"
+    odl_system_flavor: "v3-standard-4"
     tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
 
     # Features to install