Move CSIT perf job to 4c ODL image

Change-Id: I6ec5fd9a707f0d5416c8b015a62f71bd30dc0ea0
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
index 8840c984348a2696f6554897261ae7c9e90f3fff..6c186784e8147541e61e612821421707cb034ce3 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-2
+    odl_system_flavor: v1-performance-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 a2a23313aee9482995bb611e15f735d115f561a9..a7e10c9a700ffa60afc17044848113d7d5101997 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-2
+    odl_system_flavor: v1-performance-4
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 4aac42eb76c432f85a0dedde9ac6b9c9c9ff91e7..d3ff23c59c9e294de64d1f2c0b74550854dd4a26 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-2'
+    odl_system_flavor: 'v1-performance-4'

diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
index 9636e873e8cde61120da2478b2c8d5f6562d5199..8df34f773616ea175eda8446b65c8f8fb2cf723e 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-2
+    odl_system_flavor: v1-performance-4

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 19fb7d746d9bd36366401462d71cf852d0ba664f..eca4d8bbea733f4208632f68a083591e12b7abc2 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-2
+    odl_system_flavor: v1-performance-4

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index df2135474552d52df240797c6995d6d29865a7bd..eba3e225860e1ae99277b0bd34209f85b5a7166a 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-2'
+    odl_system_flavor: 'v1-performance-4'
 
     build-timeout: '480'
 

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index 891b7402d9dee0b74f3043dc296b202167eb6bcb..bc7901bb24d49b70dd214739910372aeef349e58 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-2
+    odl_system_flavor: v1-performance-4
 
     # Plot Info
     01-plot-title: 'Performance by structure'

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index 93ec5754542457e841a02a9b572f7c392a5fe0c7..f9dded57b8ac8fe09bcc175668a30440f7f43db1 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -29,6 +29,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Controller configuration
-    odl_system_flavor: v1-performance-2

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index b9e5895d22a53b1c854d5f4990f6ae0fd73c4cbe..0d130e14f4c1d472f40b764b669ff35038ffd339 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-2
+    odl_system_flavor: v1-performance-4
 
     # Features to install
     install-features: 'odl-restconf'

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 5f80302cbd02128ff5ce18f0abfb355503b1d80f..a0dee25978e73e228f405a1e19d4302aae0a319d 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-2
+    odl_system_flavor: v1-performance-4

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 34c70a506d790f75f06efcbefb619893f4fffa72..56ccf5ac0058043404162e190bdb981053cce7f1 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-2'
+    odl_system_flavor: 'v1-performance-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'
 
     # Features to install

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index ffc8284021cb0ba399a8ef72c3ee0b59c1c78906..a1d794cdf52f10d2f11aad47e946c8581f01da03 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-2
+    odl_system_flavor: v1-performance-4
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 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 2d544b2ce09a66acd277c1e62a5af52b557fa77e..e1753bfde69e4e10dfe8393eab2068c0046c2532 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-2'
+    odl_system_flavor: 'v1-performance-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'
 
     # Features to install

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 80c3fc8a658c5cfcb723e43a4edafccd0adb19d0..333bae4a1afc2fa1780497371f2595bfcc64e80a 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -27,7 +27,6 @@
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
-    odl_system_flavor: v1-performance-2
 
     # Features to install
     install-features: 'odl-restconf'