From de695137693eec82b00cb0d733cc076b38017c9d Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Sat, 17 Dec 2016 10:35:18 +0000
Subject: [PATCH] neutron: kill non-dvr OVS scenario

The project is moving into DVR+HA direction for all gate jobs. At this
point, adding jobs that are not DVR+HA is counterproductive.

Of course, since Linuxbridge does not work with DVR yet, we keep that
other scenario job flavour as-is. But there is no excuse to care about
that non-dvr OVS job.

Change-Id: I7b029acd19d8705882792a0aa6ae4aac68a4253e
---
 jenkins/jobs/devstack-gate.yaml |  1 -
 jenkins/jobs/neutron.yaml       | 47 ---------------------------------
 zuul/layout.yaml                |  3 +--
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 6a2920ddab..655de5ba58 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -2311,7 +2311,6 @@
       - '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-identity-v3-test-accounts-{node}{suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-scenario-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-lxc-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-nova-v20-api-{node}{suffix}'
diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index f2eaf10a1e..f2990737dd 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -602,53 +602,6 @@
       - console-log
 
 
-- job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-scenario-{node}{suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 130
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export DEVSTACK_GATE_TEMPEST_REGEX="^neutron.tests.tempest.scenario\."
-
-          function gate_hook {{
-              bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-scenario
-          }}
-          export -f gate_hook
-
-          function post_test_hook {{
-              bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-scenario
-          }}
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - test-results
-      - devstack-logs
-      - console-log
-
-
 - job-template:
     name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-scenario-{node-release}{suffix}'
     node: '{node}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 934c412ba9..c111378ccd 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3210,7 +3210,7 @@ jobs:
   - name: gate-tempest-dsvm-neutron-full-ssh
     voting: false
 
-  - name: ^gate-tempest-dsvm-neutron-scenario(-linuxbridge)?-ubuntu-xenial$
+  - name: ^gate-tempest-dsvm-neutron-scenario-linuxbridge-ubuntu-xenial$
     voting: false
 
   # NOTE(andrey-mp): nova-network is deprecated since Ocata
@@ -12044,7 +12044,6 @@ projects:
       - neutron-coverage-ubuntu-trusty
       - neutron-coverage-ubuntu-xenial
     experimental:
-      - gate-tempest-dsvm-neutron-scenario-ubuntu-xenial
       - gate-tempest-dsvm-neutron-scenario-linuxbridge-ubuntu-xenial
       - gate-tempest-dsvm-neutron-dvr-multinode-scenario-ubuntu-xenial-nv
       - gate-grenade-dsvm-neutron-forward-ubuntu-trusty