From 5d57a5b611d74aa7de59d3829565611bc64f9255 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Mon, 8 Jun 2015 07:42:30 -0700
Subject: [PATCH] Remove check-dg-tempest-*

These jobs exist to test proposed changes to the devstack-gate
rexec system.  This system was created to make devstack-gate
self-testing because at the time, the only logic to correctly
check out a proposed commit for devstack-gate existed within
devstack-gate itself.  Since I512203f35797837e1f4612add05f60b759a6eb07
we rely on zuul-cloner to check out devstack-gate prior to running,
thus any changes to devstack-gate will be included by zuul in the ref
that zuul-cloner checks out.

Therefore, both the rexec system in devstack-gate and the jobs
that exercised it explicitly are no longer required.

Change-Id: I2e926b55f8b9def4b7e238110c528bd2e5c82128
---
 jenkins/jobs/devstack-gate.yaml | 55 ---------------------------------
 jenkins/jobs/macros.yaml        | 12 -------
 zuul/layout.yaml                |  2 --
 3 files changed, 69 deletions(-)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 5d7301e116..46236b7648 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -1,58 +1,3 @@
-- job-template:
-    name: 'gate-dg-tempest-dsvm-full'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 125
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - experimental-devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export RE_EXEC=true
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - devstack-logs
-      - console-log
-      - zuul-swift-devstack-logs-with-console
-
-- job-template:
-    name: 'gate-dg-tempest-dsvm-full-reexec'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 125
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - experimental-devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - devstack-logs
-      - console-log
-      - zuul-swift-devstack-logs-with-console
-
 - job-template:
     name: 'gate-dg-hooks-dsvm'
     node: '{node}'
diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml
index 2073f35a8f..610a5527f5 100644
--- a/jenkins/jobs/macros.yaml
+++ b/jenkins/jobs/macros.yaml
@@ -497,18 +497,6 @@
               git://git.openstack.org \
               openstack-infra/devstack-gate
 
-- builder:
-    name: experimental-devstack-checkout
-    builders:
-      - shell: |
-          #!/bin/bash -xe
-          if [[ ! -e devstack-gate ]]; then
-              git clone git://git.openstack.org/openstack-infra/devstack-gate
-          fi
-          cd devstack-gate
-          /usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
-          cd ..
-
 - builder:
     name: link-logs
     builders:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bbc9090efc..c5787c9b49 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5205,8 +5205,6 @@ projects:
     check:
       - gate-devstack-gate-unittests
       - gate-devstack-dsvm-cells
-      - gate-dg-tempest-dsvm-full
-      - gate-dg-tempest-dsvm-full-reexec
       - gate-dg-hooks-dsvm
       - gate-grenade-dsvm-partial-ncpu
       - gate-neutron-dsvm-functional-nv