From e06c180c1d6883cb1e0d696ea1e0ef776c71e419 Mon Sep 17 00:00:00 2001
From: Maru Newby <marun@redhat.com>
Date: Sat, 14 Feb 2015 05:32:25 +0000
Subject: [PATCH] Limit target projects for the neutron func job

The neutron functional job does not rely on repositories other than
devstack and neutron, so limit the projects that devstack-gate updates
in the workspace accordingly.

This change also reverts the changes to the neutron api job that
validated that the functional job could safely run with a restricted
set of projects.

Change-Id: Ic59c3b2cc5d0b40a8f05c2d89eb1cf5e9e2f0d1d
---
 jenkins/jobs/neutron-api.yaml | 5 ++---
 jenkins/jobs/neutron.yaml     | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jenkins/jobs/neutron-api.yaml b/jenkins/jobs/neutron-api.yaml
index 3e34aed315..8e37118f90 100644
--- a/jenkins/jobs/neutron-api.yaml
+++ b/jenkins/jobs/neutron-api.yaml
@@ -21,19 +21,18 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
           export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=neutron
-          export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron"
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
 
           function gate_hook {{
-              bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-functional
+              bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh api
           }}
           export -f gate_hook
 
           function post_test_hook {{
-              bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional
+              bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh api
           }}
           export -f post_test_hook
 
diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index a14546b438..5b1c7f3dca 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -22,6 +22,10 @@
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
           export BRANCH_OVERRIDE={branch-override}
           export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=neutron
+          # Gate hooks previous to kilo will break if PROJECTS is overridden
+          if [[ ! "$BRANCH_OVERRIDE" =~ ^stable/(icehouse|juno)$ ]]; then
+              export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron"
+          fi
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi