From a2fdf8aa72859be748918d56c819736b9ae048c2 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Wed, 13 Nov 2019 12:14:36 +0100 Subject: [PATCH] Remove one of iptables_hybrid jobs In check queue there were 2 iptables_hybrid jobs. One was run on Ubuntu and one on Fedora. During the Shanghai PTG we agreed to remove one of those jobs and left only one of them to be run in both check and gate queues. This commit removes iptables_hybrid job based on Fedora image. Change-Id: If0adb7ca4e254f5b19375b471679bcc18e0c7790 --- .zuul.yaml | 7 ------- doc/source/contributor/testing/ci_scenario_jobs.rst | 5 ----- 2 files changed, 12 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index fd836fdfdef..5bf8ca43b1d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -37,7 +37,6 @@ - ^tox.ini$ - neutron-tempest-dvr-ha-multinode-full - neutron-tempest-iptables_hybrid - - neutron-tempest-iptables_hybrid-fedora - neutron-grenade - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa: voting: false @@ -366,12 +365,6 @@ available_type_drivers: flat,geneve,vlan,gre,local,vxlan irrelevant-files: *tempest-irrelevant-files -- job: - name: neutron-tempest-iptables_hybrid-fedora - parent: neutron-tempest-iptables_hybrid - nodeset: devstack-single-node-fedora-latest - irrelevant-files: *tempest-irrelevant-files - - job: name: neutron-grenade parent: legacy-dsvm-base diff --git a/doc/source/contributor/testing/ci_scenario_jobs.rst b/doc/source/contributor/testing/ci_scenario_jobs.rst index 1500b778177..6e3970d0848 100644 --- a/doc/source/contributor/testing/ci_scenario_jobs.rst +++ b/doc/source/contributor/testing/ci_scenario_jobs.rst @@ -79,11 +79,6 @@ Below is a summary of those jobs. | |(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 |