From 9ef429c8a4c370878d7c14368f5fd36f08a62599 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 2 Feb 2018 14:58:35 -0500 Subject: [PATCH] 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 --- jjb/aaa/aaa-csit-keystone.yaml | 2 +- .../bgpcep-csit-bgp-gate-ingest-mixed.yaml | 2 +- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 2 +- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 2 +- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 2 +- jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml | 2 +- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 2 +- ...ler-csit-periodic-dsbenchmark-cluster.yaml | 2 +- .../controller-csit-periodic-dsbenchmark.yaml | 2 +- jjb/mdsal/mdsal-csit-bindingv1.yaml | 2 +- jjb/netconf/netconf-scale.yaml | 2 +- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 22 +++++++++---------- .../openflowplugin-csit-cbench.yaml | 4 ++-- ...lugin-csit-clustering-perf-bulkomatic.yaml | 2 +- .../openflowplugin-csit-perf-bulkomatic.yaml | 2 +- ...flowplugin-csit-perf-stats-collection.yaml | 2 +- .../openflowplugin-csit-scale-switch.yaml | 4 ++-- .../openflowplugin-csit-scale.yaml | 2 +- jjb/releng-defaults.yaml | 10 ++++----- jjb/vtn/vtn-manager-csit-1node-openstack.yaml | 4 ++-- 20 files changed, 37 insertions(+), 37 deletions(-) diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index 5f898174f..b7ea71495 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: '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 2f5cbf60b..ea99f779c 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-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 dc8bd41a1..45034a78e 100644 --- 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 f835ad757..903d75df2 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-4 + odl_system_flavor: v2-standard-4 diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 43a1ef188..6596c26f5 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-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 c8566b3bf..326431132 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-4 + odl_system_flavor: v2-standard-4 diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 5ea5cc3dc..c0fc3a7a8 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-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 f308a1632..2d4b62a8e 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-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 65c593e3f..eebe58a38 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-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 9cfbaaff2..e52cdb70b 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-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 e18b10083..a35cda998 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-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 93b94f15c..db97acfc2 100644 --- 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 be9eb62d8..11765acbf 100644 --- 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 a6bd1362b..7513bf713 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-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 416592a8d..339ffa6a2 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-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 006c4406c..9445d68e6 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-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 f1162b8cc..ea13e8792 100644 --- 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 0e5a7e20f..27724beb2 100644 --- 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 51b9bc8a1..7d5dc7656 100644 --- 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 197a5b653..512ac50c2 100644 --- 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' -- 2.36.6