From 34b6833caa36a1005fa5b6da736ecb950b61479b Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Wed, 17 Jun 2020 14:29:05 +0200 Subject: [PATCH] Remove tempest-integrated-networking job from neutron queue As we agreed during virtual PTG we want to change tempest-multinode-full-py3 that it will run only integrated-networking tests. And then promote it to be voting and gating job. This new multinode job can replace singlenode tempest-integrated-networking job so this patch removes this one from the queues too. Change-Id: Ic61b636625824bbd6b7624a057db308a484ee463 --- .../contributor/testing/ci_scenario_jobs.rst | 11 ++++------- zuul.d/project.yaml | 16 ++++++---------- zuul.d/tempest-multinode.yaml | 8 ++++++++ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/doc/source/contributor/testing/ci_scenario_jobs.rst b/doc/source/contributor/testing/ci_scenario_jobs.rst index d185f857460..81880d9d8d6 100644 --- a/doc/source/contributor/testing/ci_scenario_jobs.rst +++ b/doc/source/contributor/testing/ci_scenario_jobs.rst @@ -54,18 +54,15 @@ Below is a summary of those jobs. +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-tempest-plugin-scenario-ovn | neutron_tempest_plugin.scenario | 3.6 | 1 | ovn | ovn | --- | False | False | False | Yes | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ - |tempest-integrated-networking |tempest.api (without slow tests) | 3.6 | 1 | openvswitch | openvswitch | legacy | False | False | 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 | | | | | | | | | | + |neutron-tempest-multinode-full-py3 |tempest.api (without slow tests) | 3.6 | 2 | openvswitch | openvswitch | legacy | False | False | True | Yes | + | |tempest.scenario | | | | | | | | | | + | |(only tests related to | | | | | | | | | | + | |Neutron and Nova) | | | | | | | | | | +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+ |neutron-tempest-dvr-ha-multinode-full |tempest.api (without slow tests) | 3.6 | 3 | openvswitch | openvswitch | dvr | True | True | True | No | |(non-voting) |tempest.scenario | | | | | dvr_snat | | | | | diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 53e4d8a6977..d83dec6f28f 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -23,7 +23,11 @@ - neutron-grenade-dvr-multinode - neutron-tempest-linuxbridge - neutron-tempest-with-uwsgi - - tempest-integrated-networking: + - neutron-tempest-multinode-full-py3 + - neutron-tempest-dvr-ha-multinode-full + - neutron-tempest-iptables_hybrid + - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa: + voting: false # We don't run the job on things like neutron docs-only changes irrelevant-files: &irrelevant-files - ^(test-|)requirements.txt$ @@ -38,14 +42,6 @@ - ^vagrant/.*$ - ^migration/.*$ - ^devstack/.*\.sample$ - - tempest-multinode-full-py3: - voting: false - irrelevant-files: *irrelevant-files - - neutron-tempest-dvr-ha-multinode-full - - neutron-tempest-iptables_hybrid - - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa: - voting: false - irrelevant-files: *irrelevant-files - tempest-slow-py3: irrelevant-files: *irrelevant-files - tempest-ipv6-only: @@ -91,9 +87,9 @@ jobs: - neutron-functional - neutron-fullstack - - tempest-integrated-networking - neutron-tempest-linuxbridge - neutron-tempest-iptables_hybrid + - neutron-tempest-multinode-full-py3 - neutron-grenade-multinode - neutron-grenade-dvr-multinode - tempest-slow-py3: diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 299df5970c7..8d29e70b8ef 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -87,6 +87,14 @@ agent: availability_zone: nova +- job: + name: neutron-tempest-multinode-full-py3 + parent: tempest-multinode-full-py3 + timeout: 10800 + irrelevant-files: *irrelevant-files + vars: + tox_envlist: integrated-network + - job: name: neutron-ovn-multinode-base description: Base multinode job for devstack/tempest to test Neutron with ovn driver.