From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Fri, 2 Feb 2018 20:02:49 +0000 (-0500)
Subject: Switch mininet to v2-highcpu-2 flavor
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=bc5d91c7c16feac13eb5320646470845ad48fe2b;p=releng%2Fbuilder.git

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 b7ea714958..67d646f67b 100644
--- 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 11765acbf9..e7b25e8d04 100644
--- 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 ea13e87924..c8fa213287 100644
--- 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 7d5dc76562..cd16b8530f 100644
--- 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