From 9c87abeeeefa8d298487c0cc597ffc4e7ee2dcef Mon Sep 17 00:00:00 2001
From: armando-migliaccio <armamig@gmail.com>
Date: Wed, 17 Dec 2014 13:56:05 -0800
Subject: [PATCH] move neutron-api job to use gate hooks

This change is dependent on [1,2] being merged first

[1] https://review.openstack.org/#/c/142558/
[2] https://review.openstack.org/#/c/142601/

Change-Id: I140d60ca8903b0f392dbb301ee0fccd68a03b1ed
---
 jenkins/jobs/neutron-api.yaml        | 19 +++++++------------
 jenkins/jobs/neutron-functional.yaml |  4 ++--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/jenkins/jobs/neutron-api.yaml b/jenkins/jobs/neutron-api.yaml
index 832ad889b9..a4c192e30c 100644
--- a/jenkins/jobs/neutron-api.yaml
+++ b/jenkins/jobs/neutron-api.yaml
@@ -25,21 +25,16 @@
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
 
+          function gate_hook {{
+              bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh api
+          }}
+          export -f gate_hook
+
           function post_test_hook {{
-              cd $BASE/new/neutron
-              # Ensure that the executing user can invoke tox on the
-              # neutron source tree.
-              sudo chown -R tempest:stack $BASE/new/neutron
-              echo "Configuring venv for neutron api test suite"
-              # Manually install tempest pending a decision on how
-              # best to include tempest as an explicit test dependency
-              # of neutron.
-              sudo -H -u tempest tox -e api --notest
-              sudo -H -u tempest .tox/api/bin/pip install $BASE/new/tempest
-              echo "Running neutron api test suite"
-              sudo -H -u tempest tox -e api
+              bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh api
           }}
           export -f post_test_hook
+
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 
diff --git a/jenkins/jobs/neutron-functional.yaml b/jenkins/jobs/neutron-functional.yaml
index 4a8453e6ff..5ae30974b9 100644
--- a/jenkins/jobs/neutron-functional.yaml
+++ b/jenkins/jobs/neutron-functional.yaml
@@ -26,12 +26,12 @@
           fi
 
           function gate_hook {{
-              bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/gate_hook.sh
+              bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-functional
           }}
           export -f gate_hook
 
           function post_test_hook {{
-              bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/post_test_hook.sh
+              bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional
           }}
           export -f post_test_hook