From 81f72c617dac50857d8b4d8bc065d44d9b8063c7 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Thu, 12 Nov 2020 22:20:49 +0100 Subject: [PATCH] Disable not used services in the tempest and rally jobs We don't need to run Swift, Cinder and etcd services in the Neutron jobs so this patch disables those services on all such jobs defined in the Neutron repository. It will skip some tests which aren't really related to Neutron and will safe some resources on test nodes. This patch also enables br-ex-tcpdump and br-int-flows services in the jobs where it was missing. It may be useful during debugging some failures of those jobs in the future. Depends-On: https://review.opendev.org/762622 Conflicts: zuul.d/tempest-multinode.yaml zuul.d/tempest-singlenode.yaml Change-Id: I0db516b184cf621e4539d11726fe1bd47b53ba05 (cherry picked from commit 747ac575249c57fe9fe70413e3a75fe81f18c946) --- zuul.d/rally.yaml | 22 ++++++++++++++ zuul.d/tempest-multinode.yaml | 52 +++++++++++++++++++++++++++++++- zuul.d/tempest-singlenode.yaml | 54 +++++++++++++++++++++++++++++++--- 3 files changed, 123 insertions(+), 5 deletions(-) diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml index 021c247f210..5e2dc1cb5dc 100644 --- a/zuul.d/rally.yaml +++ b/zuul.d/rally.yaml @@ -14,6 +14,17 @@ neutron: https://opendev.org/openstack/neutron devstack_services: neutron-trunk: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false + # Swift services + s-account: false + s-container: false + s-object: false + s-proxy: false devstack_local_conf: post-config: $NEUTRON_CONF: @@ -67,6 +78,17 @@ q-meta: false q-metering: false q-dns: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false + # Swift services + s-account: false + s-container: false + s-object: false + s-proxy: false devstack_localrc: Q_AGENT: ovn ML2_L3_PLUGIN: ovn-router,trunk diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index bbf1753d3f9..dd17f71f389 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -28,6 +28,17 @@ devstack_services: br-ex-tcpdump: true br-int-flows: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false + # Swift services + s-account: false + s-container: false + s-object: false + s-proxy: false devstack_plugins: neutron: https://opendev.org/openstack/neutron.git devstack_local_conf: @@ -68,6 +79,17 @@ q-meta: true br-ex-tcpdump: true br-int-flows: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false + # Swift services + s-account: false + s-container: false + s-object: false + s-proxy: false devstack_local_conf: post-config: $NEUTRON_CONF: @@ -100,6 +122,26 @@ tox_envlist: integrated-network devstack_plugins: neutron: https://opendev.org/openstack/neutron.git + devstack_services: + br-ex-tcpdump: true + br-int-flows: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false + # Swift services + s-account: false + s-container: false + s-object: false + s-proxy: false + group-vars: + subnode: + devstack_services: + # Cinder services + c-bak: false + c-vol: false - job: name: neutron-ovn-multinode-base @@ -151,7 +193,6 @@ extensions_to_txt: db: true devstack_services: - c-bak: false etcd: false br-ex-tcpdump: true br-int-flows: true @@ -168,6 +209,12 @@ q-meta: false q-metering: false q-dns: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false # When running python3 Swift should be disabled for now s-account: false s-container: false @@ -197,6 +244,9 @@ q-metering: false q-ovn-metadata-agent: true tls-proxy: true + # Cinder services + c-bak: false + c-vol: false devstack_localrc: Q_AGENT: ovn Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index a70ef975b04..8107c63498a 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -30,6 +30,17 @@ q-meta: true q-metering: true q-svc: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false + # Swift services + s-account: false + s-container: false + s-object: false + s-proxy: false - job: name: neutron-ovs-base @@ -137,6 +148,17 @@ mysql: false br-ex-tcpdump: true br-int-flows: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false + # Swift services + s-account: false + s-container: false + s-object: false + s-proxy: false irrelevant-files: *irrelevant-files - job: @@ -155,6 +177,17 @@ devstack_services: br-ex-tcpdump: true br-int-flows: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false + # Swift services + s-account: false + s-container: false + s-object: false + s-proxy: false # NOTE(ralonsoh): once MariaDB default version in Ubuntu is bumped to # >10.1, this workaround can be removed (bug 1855912) pre-run: playbooks/add_mariadb_repo.yaml @@ -173,6 +206,17 @@ devstack_services: br-ex-tcpdump: true br-int-flows: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false + # Swift services + s-account: false + s-container: false + s-object: false + s-proxy: false irrelevant-files: *irrelevant-files - job: @@ -219,9 +263,6 @@ devstack_services: br-ex-tcpdump: true br-int-flows: true - c-api: true - c-sch: true - c-vol: true dstat: true g-api: true g-reg: true @@ -242,7 +283,6 @@ placement-api: true q-svc: true q-dns: true - c-bak: false etcd: false q-agt: false q-dhcp: false @@ -257,6 +297,12 @@ tls-proxy: true q-qos: true q-port-forwarding: true + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false - job: name: neutron-ovn-tempest-ovs-ipv6-only-base