From 951c46c3b749b67e5998275467c618f948646f13 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Sun, 14 Jul 2019 12:23:11 +0200 Subject: [PATCH] Switch neutron tempest jobs to run only networking related tests In commit [1] neutron replaced using "integrated-gate" template with new "integrated-gate-networking" tempate to run only tests related to Neutron and Nova in Neutron CI. This patch switches tempest jobs defined in neutron directly: * neutron-tempest-dvr * neutron-tempest-linuxbridge * neutron-tempest-iptables_hybrid * neutron-tempest-with-uwsgi to inherit from this new "tempest-integrated-networking" job and run also only tests related to Neutron and Nova. [1] https://review.opendev.org/#/c/669815/ Change-Id: I2aa60fa1aa98e79f8b2597e490c00f7410f2a93d --- .zuul.yaml | 13 ++++--------- doc/source/contributor/testing/ci_scenario_jobs.rst | 12 +++++++++++- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 1a422549092..3a11691679b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -181,7 +181,7 @@ - job: name: neutron-tempest-dvr - parent: tempest-full-py3 + parent: tempest-integrated-networking timeout: 10800 required-projects: - openstack/devstack-gate @@ -195,7 +195,7 @@ - job: name: neutron-tempest-linuxbridge - parent: tempest-full-py3 + parent: tempest-integrated-networking timeout: 10800 required-projects: - openstack/devstack-gate @@ -317,7 +317,7 @@ - job: name: neutron-tempest-iptables_hybrid - parent: tempest-full-py3 + parent: tempest-integrated-networking timeout: 10800 required-projects: - openstack/devstack-gate @@ -427,15 +427,10 @@ - job: name: neutron-tempest-with-uwsgi - parent: devstack-tempest + parent: tempest-integrated-networking description: Run neutron Tempest tests with uwsgi timeout: 8400 - required-projects: - - openstack/neutron - - openstack/tempest vars: - tox_envlist: full devstack_localrc: - USE_PYTHON3: true NEUTRON_DEPLOY_MOD_WSGI: true irrelevant-files: *tempest-irrelevant-files diff --git a/doc/source/contributor/testing/ci_scenario_jobs.rst b/doc/source/contributor/testing/ci_scenario_jobs.rst index 18231a87393..9fcff7b7489 100644 --- a/doc/source/contributor/testing/ci_scenario_jobs.rst +++ b/doc/source/contributor/testing/ci_scenario_jobs.rst @@ -54,9 +54,13 @@ Below is a summary of those jobs. +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-tempest-dvr |tempest.api (without slow tests) | 3.6 | 1 | openvswitch | openvswitch | dvr_snat | False | True | True | Yes | | |tempest.scenario | | | | | | | | | | + | |(only tests related to | | | | | | | | | | + | |Neutron and Nova) | | | | | | | | | | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-tempest-linuxbridge |tempest.api (without slow tests) | 3.6 | 1 | linuxbridge | iptables | legacy | False | False | True | Yes | | |tempest.scenario | | | | | | | | | | + | |(only tests related to | | | | | | | | | | + | |Neutron and Nova) | | | | | | | | | | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |tempest-multinode-full-py3 |tempest.api (without slow tests) | 3.6 | 2 | openvswitch | openvswitch | legacy | False | False | True | No | |(non-voting) |tempest.scenario | | | | | | | | | | @@ -67,14 +71,20 @@ Below is a summary of those jobs. +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-tempest-iptables_hybrid |tempest.api (without slow tests) | 3.6 | 1 | openvswitch | iptables_hybrid | legacy | False | False | True | Yes | | |tempest.scenario | | | | | | | | | | + | |(only tests related to | | | | | | | | | | + | |Neutron and Nova) | | | | | | | | | | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-tempest-iptables_hybrid-fedora |tempest.api (without slow tests) | 3.6 | 1 | openvswitch | iptables_hybrid | legacy | False | False | True | No | | |tempest.scenario | | | | | | | | | | + | |(only tests related to | | | | | | | | | | + | |Neutron and Nova) | | | | | | | | | | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |tempest-slow-py3 |tempest slow tests | 3.6 | 2 | openvswitch | openvswitch | legacy | False | False | True | Yes | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-tempest-with-uwsgi |tempest.api (without slow tests) | 3.6 | 1 | openvswitch | openvswitch | legacy | False | False | True | No | - |(non-voting) | | | | | | | | | | | + |(non-voting) |tempest.scenario | | | | | | | | | | + | |(only tests related to | | | | | | | | | | + | |Neutron and Nova) | | | | | | | | | | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ Grenade jobs running in Neutron CI