From 03378182f4ea06e27a1debdf0b07ddffb348ff24 Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Wed, 26 Feb 2020 17:08:54 +0100
Subject: [PATCH] Remove neutron-tempest-dvr job from CI

This is single node dvr job and we decided on the Neutron CI
meeting that we will remove it from both check and gate queues
and we will replace it with "neutron-tempest-dvr-ha-multinode-full"
which is similar but multinode job.

Job definition isn't removed as it is run in Tempest CI.

This patch also changes tox_envlist for the
"neutron-tempest-dvr-ha-multinode-full" job to run only networking
related tests intead of all tempest tests.

Change-Id: If78652478ec4720a4a0bc56e9de5a9186e33f57a
---
 doc/source/contributor/testing/ci_scenario_jobs.rst | 5 -----
 zuul.d/project.yaml                                 | 2 --
 zuul.d/tempest-multinode.yaml                       | 1 +
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/doc/source/contributor/testing/ci_scenario_jobs.rst b/doc/source/contributor/testing/ci_scenario_jobs.rst
index 8bfdd4b4f7b..2bc1dafc1b2 100644
--- a/doc/source/contributor/testing/ci_scenario_jobs.rst
+++ b/doc/source/contributor/testing/ci_scenario_jobs.rst
@@ -57,11 +57,6 @@ Below is a summary of those jobs.
     |                                              |(only tests related to            |         |       |             |                 |          |       |        |            |             |
     |                                              |Neutron and Nova)                 |         |       |             |                 |          |       |        |            |             |
     +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
-    |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            |         |       |             |                 |          |       |        |            |             |
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f4c7b82f68c..73e7e11f524 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -17,7 +17,6 @@
         - neutron-functional
         - neutron-fullstack
         - neutron-rally-task
-        - neutron-tempest-dvr
         - neutron-tempest-linuxbridge
         - neutron-grenade-multinode
         - neutron-grenade-dvr-multinode
@@ -94,7 +93,6 @@
         - neutron-functional
         - neutron-fullstack
         - tempest-integrated-networking
-        - neutron-tempest-dvr
         - neutron-tempest-linuxbridge
         - neutron-tempest-iptables_hybrid
         - neutron-grenade-multinode
diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index 3c0f359cba9..89b5b682e25 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -24,6 +24,7 @@
       - ^migration/.*$
     voting: false
     vars:
+      tox_envlist: integrated-network
       devstack_local_conf:
         post-config:
           $NEUTRON_CONF: