From 5f9b95284252316248d0789088062cf36186d6c4 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 16 Feb 2021 22:33:42 +1000 Subject: [PATCH] Migrate jobs from odl-standard-* flavors to v3 v3 flavors guarantees jobs spin on newer hardware that are faster and cost-efficient than the v2 flavors. Signed-off-by: Anil Belur Change-Id: I82c6dbe13a3e9c817ef9a9a4fe61f665a2800a4f --- .../clouds/openstack/odlvex/centos7-builder-4c-16g.cfg | 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-throughpcep.yaml | 2 +- jjb/controller/controller-csit-dsbenchmark-cluster.yaml | 2 +- jjb/controller/controller-csit-dsbenchmark.yaml | 2 +- jjb/integration/integration-templates.yaml | 4 ++-- jjb/mdsal/mdsal-csit-bindingv1.yaml | 2 +- jjb/netconf/netconf-scale.yaml | 2 +- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 4 ++-- .../openflowplugin-csit-perf-stats-collection.yaml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg index a7c9327f1..e0bcabe0c 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-builder-4c-16g IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896 -HARDWARE_ID=odl-standard-4 +HARDWARE_ID=v3-standard-4 diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index e4ef3b03a..1c2b4594c 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -48,7 +48,7 @@ -v TEST_DURATION_MULTIPLIER:4 # Controller configuration - odl_system_flavor: odl-standard-4 + odl_system_flavor: v3-standard-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 fafc4c483..a35454904 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -47,4 +47,4 @@ -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0 # Controller configuration - odl_system_flavor: odl-standard-4 + odl_system_flavor: v3-standard-4 diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index ee582587d..d0952e986 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -36,4 +36,4 @@ robot-options: "-v USE_NETCONF_CONNECTOR:False" # Controller configuration - odl_system_flavor: "odl-standard-4" + odl_system_flavor: "v3-standard-4" diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 878165f7e..aa6b5cba4 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -42,4 +42,4 @@ -v UPDATER_TIMEOUT:900 # Controller configuration - odl_system_flavor: odl-standard-4 + odl_system_flavor: v3-standard-4 diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index e09d091ce..32907037b 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -36,7 +36,7 @@ # ODL system image to use # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough. - odl_system_flavor: "odl-standard-4" + odl_system_flavor: "v3-standard-4" build-timeout: "480" diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index db2ddc75a..9038123d0 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -37,7 +37,7 @@ # ODL system image to use # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough. - odl_system_flavor: odl-standard-4 + odl_system_flavor: v3-standard-4 # Plot Info 01-plot-title: "Performance by structure" diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 04561787f..5dd500dd1 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1050,7 +1050,7 @@ odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" controller-max-mem: "2048m" openstack_system_count: 1 - openstack_system_flavor: "odl-standard-4" + openstack_system_flavor: "v3-standard-4" openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669" openstack_system2_count: 0 openstack_system2_flavor: "odl-standard-1" @@ -1480,7 +1480,7 @@ odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896" controller-max-mem: "2048m" openstack_system_count: 1 - openstack_system_flavor: "odl-standard-4" + openstack_system_flavor: "v3-standard-4" openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669" openstack_system2_count: 0 openstack_system2_flavor: "odl-standard-1" diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index f35425af2..94ed4421f 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -30,7 +30,7 @@ tools_system_count: 0 # odl system flavor - odl_system_flavor: odl-standard-4 + odl_system_flavor: v3-standard-4 # Features to install install-features: "odl-restconf" diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 46efd0a09..050e557fb 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -37,7 +37,7 @@ robot-options: "-v USE_NETCONF_CONNECTOR:False" # ODL system configuration - odl_system_flavor: odl-standard-4 + odl_system_flavor: v3-standard-4 - project: name: netconf-csit-scale-max-devices diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index af147a715..f842b4c62 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -15,7 +15,7 @@ security-group-mode: "stateful" odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-standard-4 + openstack_system2_flavor: v3-standard-4 tools_system_count: 0 os-cmb-cnt: 0 os-ctl-cnt: 1 @@ -182,7 +182,7 @@ security-group-mode: "stateful" odl_system_flavor: odl-highcpu-2 openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-standard-4 + openstack_system2_flavor: v3-standard-4 tools_system_count: 0 os-cmb-cnt: 0 os-ctl-cnt: 1 diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 9027fb1b4..d6d6141c2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -29,7 +29,7 @@ scope: "only" # Job images - odl_system_flavor: "odl-standard-4" + odl_system_flavor: "v3-standard-4" tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743" # Features to install -- 2.36.6