From 151dab39dcb377ffc4a422f28368416d696ef54a Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Wed, 20 Nov 2019 12:04:34 +0100
Subject: [PATCH] Remove grenade-py3 job from Neutron CI

We have run neutron-grenade-multinode in both check and gate queues
already. This job is almost the same as grenade-py3. The only difference
from Neutron pov is that neutron-grenade-multinode is multinode job and
grenade-py3 is single node job.
So we agreed on last Neutron CI meeting [1], that there is no need to
run both of those jobs.

As grenade-py3 is part of integrated-gate-networking template together
with tempest-integrated-networking job this patch removes also
integrated-gate-networking template from neutron's zuul config and adds
only tempest-integrated-networking to both check and gate queues.

[1] http://eavesdrop.openstack.org/meetings/neutron_ci/2019/neutron_ci.2019-11-19-16.00.log.html#l-179

Change-Id: Ic2e7ca04929dc89a2e408465eb34ef3feec2e328
---
 .zuul.yaml                                          | 12 +++++-------
 doc/source/contributor/testing/ci_scenario_jobs.rst |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 053dc7d4613..a26030c42a8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,7 +11,6 @@
       - publish-openstack-docs-pti
       - periodic-stable-jobs
       - check-requirements
-      - integrated-gate-networking
       - release-notes-jobs-python3
     check:
       jobs:
@@ -22,8 +21,7 @@
         - neutron-tempest-linuxbridge
         - neutron-grenade-multinode
         - neutron-grenade-dvr-multinode
-        - tempest-multinode-full-py3:
-            voting: false
+        - tempest-integrated-networking:
             # We don't run the job on things like neutron docs-only changes
             irrelevant-files: &tempest-irrelevant-files
               - ^(test-|)requirements.txt$
@@ -37,6 +35,9 @@
               - ^tox.ini$
               - ^vagrant/.*$
               - ^migration/.*$
+        - tempest-multinode-full-py3:
+            voting: false
+            irrelevant-files: *tempest-irrelevant-files
         - neutron-tempest-dvr-ha-multinode-full
         - neutron-tempest-iptables_hybrid
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa:
@@ -48,8 +49,6 @@
         - networking-midonet-tempest-aio-ml2-centos-7:
             voting: false
             irrelevant-files: *tempest-irrelevant-files
-        - grenade-py3:
-            irrelevant-files: *tempest-irrelevant-files
         - tempest-ipv6-only:
             irrelevant-files: *tempest-irrelevant-files
         - openstacksdk-functional-devstack-networking:
@@ -78,6 +77,7 @@
       jobs:
         - neutron-functional
         - neutron-fullstack
+        - tempest-integrated-networking
         - neutron-tempest-dvr
         - neutron-tempest-linuxbridge
         - neutron-tempest-iptables_hybrid
@@ -85,8 +85,6 @@
         - neutron-grenade-dvr-multinode
         - tempest-slow-py3:
             irrelevant-files: *tempest-irrelevant-files
-        - grenade-py3:
-            irrelevant-files: *tempest-irrelevant-files
         - tempest-ipv6-only:
             irrelevant-files: *tempest-irrelevant-files
        #- neutron-ovn-tempest-ovs-release
diff --git a/doc/source/contributor/testing/ci_scenario_jobs.rst b/doc/source/contributor/testing/ci_scenario_jobs.rst
index d6bb160259b..8bfdd4b4f7b 100644
--- a/doc/source/contributor/testing/ci_scenario_jobs.rst
+++ b/doc/source/contributor/testing/ci_scenario_jobs.rst
@@ -109,8 +109,6 @@ Below is summary of those jobs.
     | Job name                       | python  | nodes | L2 agent    | firewall    | L3 agent | L3 HA | L3 DVR | enable_dvr | Run in gate |
     |                                | version |       |             | driver      | mode     |       |        |            | queue       |
     +================================+=========+=======+=============+=============+==========+=======+========+============+=============+
-    | grenade-py3                    |   3.6   |   1   | openvswitch | openvswitch | legacy   | False | False  | True       | Yes         |
-    +--------------------------------+---------+-------+-------------+-------------+----------+-------+--------+------------+-------------+
     | neutron-grenade-multinode      |   3.6   |   2   | openvswitch | openvswitch | legacy   | False | False  | True       | Yes         |
     +--------------------------------+---------+-------+-------------+-------------+----------+-------+--------+------------+-------------+
     | neutron-grenade-dvr-multinode  |   3.6   |   2   | openvswitch | openvswitch | dvr      | False | False  | True       | Yes         |