From 33d15e0c10119ed1dc0b25f5338ab63e8cfd2acd Mon Sep 17 00:00:00 2001
From: Morgan Fainberg <morgan.fainberg@gmail.com>
Date: Sun, 22 Jun 2014 18:32:05 -0700
Subject: [PATCH] Remove apache-services tempest check

With the aim to reduce the number of tempest runs, instead of
using an explicit apache-services tempest run, the apache
deployed services will be added to one of the already existing
tempest jobs, keeping check and gate resource usage to a
minimum.

Change-Id: I26a5d3f2222b1a0262d50d319dcb25851df314e1
---
 .../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 8ff2efdd59..3bc691a87f 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
@@ -125,38 +125,6 @@
       - devstack-logs
       - console-log
 
-- job-template:
-    name: '{pipeline}-tempest-dsvm-full-apache-services{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - timeout:
-          timeout: 125
-          fail: true
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - 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 DEVSTACK_GATE_USE_APACHE=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
-      - console-log
-
 - job-template:
     name: '{pipeline}-tempest-master-dsvm-full{branch-designator}'
     node: '{node}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index afa2f8f76d..8f0737c82b 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -648,9 +648,6 @@ jobs:
   - name: gate-swift-tox-func
     branch: ^(?!stable/(havana|icehouse)).*$
     voting: false
-  - name: ^(gate|check)-tempest-dsvm-full-apache-services
-    voting: false
-    branch: ^(?!stable/(havana|icehouse)).*$
   - name: gate-tuskar-ui-selenium
     voting: false
   - name: gate-pecan-tox-barbican-tip
@@ -946,7 +943,6 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - check-swift-dsvm-functional
       - check-rally-dsvm-keystone
-      - check-tempest-dsvm-full-apache-services
     gate:
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-large-ops
@@ -1387,7 +1383,6 @@ projects:
       - check-devstack-dsvm-cells
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-tempest-dsvm-full-apache-services
     gate:
       - gate-python-keystoneclient-python33
       - gate-devstack-dsvm-cells