From d1ab4e26ea4e8a767e52f3e9b711021bd66edaf3 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Wed, 13 Jan 2021 15:42:17 +0100 Subject: [PATCH] Switch tempest jobs to neutron specific ones In neutron CI queues we were running tempest-slow-py3 and tempest-ipv6-only jobs which are defined in tempest repository and runs all tests, e.g related to Swift or Cinder. This patch defines new jobs: "neutron-tempest-slow-py3" and "neutron-tempest-ipv6-only" which inherits from the tempest jobs but disables Cinder and Swift services. Additionally "neutron-tempest-ipv6-only" job now runs only "integrated-networking" tox_envlist. Change-Id: Icd376c144e1993ca84890c76743fda4196662d9b --- .../contributor/testing/ci_scenario_jobs.rst | 6 ++-- zuul.d/project.yaml | 12 +++----- zuul.d/tempest-multinode.yaml | 29 +++++++++++++++++++ zuul.d/tempest-singlenode.yaml | 24 +++++++++++++++ 4 files changed, 61 insertions(+), 10 deletions(-) diff --git a/doc/source/contributor/testing/ci_scenario_jobs.rst b/doc/source/contributor/testing/ci_scenario_jobs.rst index b1fdf304838..6a38272b65c 100644 --- a/doc/source/contributor/testing/ci_scenario_jobs.rst +++ b/doc/source/contributor/testing/ci_scenario_jobs.rst @@ -77,14 +77,16 @@ Below is a summary of those jobs. |(non-voting) |tempest.scenario | | | | | dvr_snat | | | | | | | | | | | | dvr_snat | | | | | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ - |tempest-slow-py3 |tempest slow tests | 3.6 | 2 | openvswitch | openvswitch | legacy | False | False | True | Yes | + |neutron-tempest-slow-py3 |tempest slow tests | 3.6 | 2 | openvswitch | openvswitch | legacy | False | False | True | Yes | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-tempest-with-uwsgi-loki |tempest.api (without slow tests) | 3.6 | 1 | openvswitch | openvswitch | legacy | False | False | True | No | |(non-voting) |tempest.scenario | | | | | | | | | | | |(only tests related to | | | | | | | | | | | |Neutron and Nova) | | | | | | | | | | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ - |tempest-ipv6-only |tempest smoke + IPv6 tests | 3.6 | 1 | openvswitch | openvswitch | legacy | False | False | True | Yes | + |neutron-tempest-ipv6-only |tempest smoke + IPv6 tests | 3.6 | 1 | openvswitch | openvswitch | legacy | False | False | True | Yes | + | |(only tests related to | | | | | | | | | | + | |Neutron and Nova) | | | | | | | | | | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-ovn-tempest-ovs-release |Various tempest api, scenario | 3.6 | 1 | ovn | ovn | --- | False | False | True | Yes | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 9b496164ab3..dc90d16cfde 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -39,10 +39,8 @@ - ^vagrant/.*$ - ^migration/.*$ - ^devstack/.*\.sample$ - - tempest-slow-py3: - irrelevant-files: *irrelevant-files - - tempest-ipv6-only: - irrelevant-files: *irrelevant-files + - neutron-tempest-slow-py3 + - neutron-tempest-ipv6-only - neutron-tempest-with-neutron-lib-master: voting: false irrelevant-files: *irrelevant-files @@ -120,10 +118,8 @@ - neutron-tempest-multinode-full-py3 - neutron-grenade-multinode - neutron-grenade-dvr-multinode - - tempest-slow-py3: - irrelevant-files: *irrelevant-files - - tempest-ipv6-only: - irrelevant-files: *irrelevant-files + - neutron-tempest-slow-py3 + - neutron-tempest-ipv6-only - neutron-ovn-tempest-ovs-release - neutron-ovn-tempest-ovs-release-ipv6-only - openstack-tox-py36: # from openstack-python3-wallaby-jobs template diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index f0987bddf9e..e17d9c27243 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -143,6 +143,35 @@ c-bak: false c-vol: false +- job: + name: neutron-tempest-slow-py3 + parent: tempest-slow-py3 + timeout: 10800 + irrelevant-files: *irrelevant-files + vars: + 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 description: Base multinode job for devstack/tempest to test Neutron with ovn driver. diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 70819faaf9c..2fab8b53f5d 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -367,6 +367,30 @@ c-vol: false cinder: false +- job: + name: neutron-tempest-ipv6-only + parent: tempest-ipv6-only + timeout: 10800 + irrelevant-files: *irrelevant-files + vars: + 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 + - job: name: neutron-ovn-tempest-ovs-master description: Job testing for devstack/tempest testing Neutron with ovn driver and OVN master branch