From 8179ffbebd8315f84070d1c1c04d6b9289eef4b0 Mon Sep 17 00:00:00 2001
From: Attila Fazekas <afazekas@redhat.com>
Date: Wed, 7 Jan 2015 10:12:25 +0100
Subject: [PATCH] Unbreak stable neutron functional jobs
The 9c87abeeeefa8d298487c0cc597ffc4e7ee2dcef is supported
a neutron code reorganization on the master branch,
but did not considered the stable branches.
The neutron functional job will fall back to the previous location,
when the new script is not available.
Change-Id: I2d4595abf68c6961eb331dd88ef75ce0d0002aa0
---
jenkins/jobs/neutron-functional.yaml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/jenkins/jobs/neutron-functional.yaml b/jenkins/jobs/neutron-functional.yaml
index 5ae30974b9..025d339b18 100644
--- a/jenkins/jobs/neutron-functional.yaml
+++ b/jenkins/jobs/neutron-functional.yaml
@@ -26,12 +26,22 @@
fi
function gate_hook {{
- bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-functional
+ if [[ -e $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh ]]; then
+ bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-functional
+ else
+ # Before kilo
+ bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/gate_hook.sh
+ fi
}}
export -f gate_hook
function post_test_hook {{
- bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional
+ if [[ -e $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh ]]; then
+ bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional
+ else
+ # Before kilo
+ bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/post_test_hook.sh
+ fi
}}
export -f post_test_hook