Switch v1-performance to v2-standard flavors

v1-performance is deprecated and the official name for these VMs
are now called v2-standard.

Change-Id: I7bba5316c2de720718fe5a8283a24349ee2cc1fe
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml
index 5f898174fb622677be960b459b7967cae9384882..b7ea7149583d24ea403d312c3ca25a27b425c8a0 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -29,7 +29,7 @@
     install-features: 'odl-restconf-all'
 
     tools_system_count: '1'
-    tools_system_flavor: 'v1-performance-1'
+    tools_system_flavor: 'v2-standard-1'
     tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317'
 
     # Robot custom options

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
index 2f5cbf60ba85c630e4d9defe136d668aa9bbfe4e..ea99f779ce575040d0a1c103f93d1910eed9dca7 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
@@ -45,7 +45,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
     # Plot Info
     01-plot-title: 'Number of generated updates'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index dc8bd41a11521d94cf4c54a99f19995d4de0559f..45034a78e98477178cc7c8b7116b6ca5d2f5436d 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -46,7 +46,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: v1-performance-2
+    odl_system_flavor: v2-standard-2
 
     # 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 f835ad75778a19ba174eae39de615a9d0e7481cb..903d75df259a8d446f7d2f132dc5bf16f7a25c71 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -46,5 +46,5 @@
         -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 43a1ef1881f92e401b6605acf28cc0485a917528..6596c26f534eb1101a22d3f5235ac59aea2f3db2 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -35,4 +35,4 @@
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # Controller configuration
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'

diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
index c8566b3bfe4a5d7d1aa5d29f3aaafc813aa5cc90..3264311325adca2addacac1422cfd84065aaf50a 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
@@ -38,4 +38,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 5ea5cc3dcde318993b62cf858a04f246c5133280..c0fc3a7a886c18f2a9e8e02955b76cd3b0abf9c1 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -39,4 +39,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index f308a1632ec982b5da0a0277a70b0f65da719be0..2d4b62a8e5a5824f722e8a0534f0257ddd39c289 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
@@ -34,7 +34,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
 
     build-timeout: '480'
 

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index 65c593e3f74a68e2dbe6fb65c9ef2b6e066f12d3..eebe58a380c1f1d96a0c1ba72bca8660b8e027a1 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
@@ -35,7 +35,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
     # Plot Info
     01-plot-title: 'Performance by structure'

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 9cfbaaff2b05fc5f884c81dfd9e45b83c7dae1b2..e52cdb70b4e9a72b023c71102eec570949894fa2 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -26,7 +26,7 @@
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
     # Features to install
     install-features: 'odl-restconf'

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index e18b10083b6aa6d5be378dbddbea5e40675af406..a35cda99810032ce1d31648c43651cf27ab759f2 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -35,4 +35,4 @@
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # ODL system configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 93b94f15c5021763c7347c94f864932dc7deafa9..db97acfc27f6e1207661b6c580ef323339bd986f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -12,9 +12,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
@@ -76,9 +76,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
@@ -137,9 +137,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
@@ -185,8 +185,8 @@
 
     project: 'netvirt'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-4
-    openstack_system2_flavor: v1-performance-2
+    odl_system_flavor: v2-standard-4
+    openstack_system2_flavor: v2-standard-2
 
     topology:
       - 1node:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index be9eb62d82da3e3b0c9508fbb2b6a4ace45e2c0a..11765acbf91b08a55bdbc7da4c831f3a34d24e9b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -25,9 +25,9 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
-    tools_system_flavor: 'v1-performance-2'
+    tools_system_flavor: 'v2-standard-2'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index a6bd1362ba678aaf0f37e6d8bc386765be4cbde4..7513bf7132c6558e7bec2ea3582a15b28d53a58d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 416592a8d75d6ef2050e3bd6440d459d3d267d16..339ffa6a2c70f73b8ee382ed1996bd24755f10c0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 006c4406cddfd294df2ad82e491542c7901aec80..9445d68e6b273f8e82603cd35e860591cf8d7be0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index f1162b8ccddd896d21aa07a60deb097e1bf83b25..ea13e8792460d46a124bd1684e26ec29c2eb2a9b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -25,9 +25,9 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
-    tools_system_flavor: 'v1-performance-2'
+    tools_system_flavor: 'v2-standard-2'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 0e5a7e20fbb0cddeb9e2a156427685153bea4206..27724beb27850d0547a3a6eb817fd4bc15dbf0c7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 51b9bc8a154d3668257c83b192cdb9b2d288dc9b..7d5dc765628b7f4696976205cfcc3c336289c2e2 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -74,19 +74,19 @@
     openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
-    docker_system_flavor: v1-performance-1
+    docker_system_flavor: v2-standard-1
     docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
     odl_system_count: 1
-    odl_system_flavor: v1-performance-2
+    odl_system_flavor: v2-standard-2
     odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
     openstack_system_count: 1
-    openstack_system_flavor: v1-performance-4
+    openstack_system_flavor: v2-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     openstack_system2_count: 0
-    openstack_system2_flavor: v1-performance-1
+    openstack_system2_flavor: v2-standard-1
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     tools_system_count: 1
-    tools_system_flavor: v1-performance-1
+    tools_system_flavor: v2-standard-1
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Default Robot framework options

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 197a5b653b996bf417e03f2056f8942c3e7a491a..512ac50c28cc6e564e8f1ae5194ccfb6f1e18f0a 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -42,6 +42,6 @@
     public-bridge: 'br-ex'
     disable-openstack-services: 'n-net,q-l3'
     tenant-network-type: 'local'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
     odl-ml2-driver-version: 'v2'