Switch mininet to v2-highcpu-2 flavor

Mininet nodes do not need 8g of RAM and are likely using the flavors
defined for the CPU count and not ram. Let's bump them to 2c-2g
flavors.

Change-Id: If24215149aa59313726cd87a8aea6ad69d9a0b55
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 b7ea7149583d24ea403d312c3ca25a27b425c8a0..67d646f67b6d8af36a6ef5bc9f353b2863e78440 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: 'v2-standard-1'
+    tools_system_flavor: 'v2-highcpu-2'
     tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317'
 
     # Robot custom options

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

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 7d5dc765628b7f4696976205cfcc3c336289c2e2..cd16b8530f02a0a382b333ae42d185d5dcfef217 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -86,7 +86,7 @@
     openstack_system2_flavor: v2-standard-1
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     tools_system_count: 1
-    tools_system_flavor: v2-standard-1
+    tools_system_flavor: v2-highcpu-2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Default Robot framework options