From: Luis Gomez Date: Sat, 16 Dec 2017 01:22:03 +0000 (-0800) Subject: Move CSIT perf job to 4c ODL image X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=94c375fc80a9590586b9f8af51e56ec1ce8733cd;p=releng%2Fbuilder.git Move CSIT perf job to 4c ODL image Change-Id: I6ec5fd9a707f0d5416c8b015a62f71bd30dc0ea0 Signed-off-by: Luis Gomez --- diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml index 8840c9843..6c186784e 100644 --- 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 a2a23313a..a7e10c9a7 100644 --- 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 4aac42eb7..d3ff23c59 100644 --- 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 9636e873e..8df34f773 100644 --- 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 19fb7d746..eca4d8bbe 100644 --- 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 df2135474..eba3e2258 100644 --- 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 891b7402d..bc7901bb2 100644 --- 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 93ec57545..f9dded57b 100644 --- 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 b9e5895d2..0d130e14f 100644 --- 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 5f80302cb..a0dee2597 100644 --- 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 34c70a506..56ccf5ac0 100644 --- 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 ffc828402..a1d794cdf 100644 --- 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 2d544b2ce..e1753bfde 100644 --- 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 80c3fc8a6..333bae4a1 100644 --- 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'