From 5ee281ed20befc673dd2111405cfd265394f619f Mon Sep 17 00:00:00 2001
From: Sean Dague <sean.dague@samsung.com>
Date: Thu, 13 Mar 2014 18:18:41 -0400
Subject: [PATCH] remove the check-devstack-dsvm-neutron job

this job was added to help neutron work towards functional grenade
tests, which used the devstack exercises. However we don't use the
devstack exercises in grenade any more, so it's not needed.

Change-Id: Ib740eec358e847681ad27a27229fd6b40802afb2
---
 .../config/devstack-gate.yaml                 | 32 -------------------
 .../openstack_project/files/zuul/layout.yaml  |  5 ---
 2 files changed, 37 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index 6f8396c51d..8119dc06a7 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -904,37 +904,6 @@
       - console-log
 
 
-- job-template:
-    name: '{pipeline}-devstack-dsvm-neutron{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - timeout:
-          timeout: 125
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_EXERCISES=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
 - job-template:
     name: '{pipeline}-tempest-dsvm-all{branch-designator}'
     node: '{node}'
@@ -1102,7 +1071,6 @@
       - '{pipeline}-tempest-dsvm-sahara-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-sahara-postgres{branch-designator}'
       - '{pipeline}-tempest-dsvm-sahara-neutron{branch-designator}'
-      - '{pipeline}-devstack-dsvm-neutron{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}'
       - '{pipeline}-tempest-dsvm-marconi{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 397f67d111..fbe4dc87f0 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -312,9 +312,6 @@ jobs:
     branch: ^(?!stable/grizzly).*$
   - name: ^(gate|check)-tempest-dsvm-neutron-pg$
     branch: ^(?!stable/grizzly).*$
-  - name: check-devstack-dsvm-neutron
-    branch: ^(?!stable/grizzly).*$
-    voting: false
   - name: ^(gate|check)-tempest-dsvm-neutron-full$
     branch: ^(?!stable/grizzly).*$
     voting: false
@@ -924,7 +921,6 @@ projects:
       - check-tempest-dsvm-neutron-pg
       - gate-tempest-dsvm-neutron-large-ops
       - check-grenade-dsvm-neutron
-      - check-devstack-dsvm-neutron
     gate:
       - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-neutron-pg
@@ -2383,7 +2379,6 @@ projects:
       - check-grenade-dsvm-forward
       - check-grenade-dsvm-partial-ncpu
       - check-swift-dsvm-functional
-      - check-devstack-dsvm-neutron
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
       - check-tempest-dsvm-sahara-full-nv