From 3efda574d3e133f937a913be6dcfcec75fe3b7dd Mon Sep 17 00:00:00 2001
From: Nikhil Manchanda <SlickNik@gmail.com>
Date: Mon, 31 Mar 2014 23:35:09 -0700
Subject: [PATCH] Remove experimental trove devstack-gate job

Now that trove is part of the integrated gate, the experimental
tempest-dsvm-trove-full job which was non-voting is no longer
needed, and should be removed.

Change-Id: I8763fa38afab40e0bc6e1014f9ea8c94496b105d
---
 .../config/devstack-gate.yaml                 | 32 -------------------
 .../openstack_project/files/zuul/layout.yaml  |  7 ----
 2 files changed, 39 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 9e61671470..407f4eb009 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
@@ -1149,37 +1149,6 @@
       - console-log
 
 
-- job-template:
-    name: '{pipeline}-tempest-dsvm-trove-full{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - timeout:
-          timeout: 95
-          fail: true
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=90
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_TROVE=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
-
-    publishers:
-      - devstack-logs
-
 - job:
     name: gate-devstack-gate-unittests
     node: bare-precise
@@ -1236,6 +1205,5 @@
       - '{pipeline}-tempest-dsvm-all{branch-designator}'
       - '{pipeline}-tempest-dsvm-coverage{branch-designator}'
       - '{pipeline}-tempest-dsvm-stress{branch-designator}'
-      - '{pipeline}-tempest-dsvm-trove-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-full-non-isolated{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index f2fdc6fd3e..cae3c0b1d4 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -445,8 +445,6 @@ jobs:
     voting: false
   - name: ^(gate|check)-tempest-dsvm-sahara-neutron-nv$
     voting: false
-  - name: ^(gate|check)-tempest-dsvm-trove-full$
-    voting: false
   - name: gate-keystone-python33
     voting: false
   - name: gate-marconi-python33
@@ -1048,10 +1046,6 @@ projects:
       - name: openstack-server-publish-jobs
       - name: check-requirements
       - name: integrated-gate
-    check:
-      - check-tempest-dsvm-trove-full
-    gate:
-      - gate-tempest-dsvm-trove-full
     post:
       - trove-upstream-translation-update
     pre-release:
@@ -2138,7 +2132,6 @@ projects:
       - gate-grenade-dsvm-partial-ncpu
     experimental:
       - gate-grenade-dsvm-forward
-      - gate-tempest-dsvm-trove-full
       - check-tempest-dsvm-marconi
       - check-tempest-dsvm-virtual-ironic-nv
     experimental-tripleo: