From 5667c17b1bf8210c8f98b08f6a7675c87ca257c6 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Wed, 25 Oct 2017 11:44:20 +0100
Subject: [PATCH] Use zuul v3 src location to install ARA

With zuul v3 the ARA git clone will be there if
the test is executed by the ARA repo, or if there
is a depends-on patch from ARA. This allows us to
simplify the conditional.

Change-Id: Id76b2084b1ba8df7bfddd4fbb4b0cbe9859fd849
---
 test-ansible-functional.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test-ansible-functional.sh b/test-ansible-functional.sh
index 8755945b..67e56e4a 100755
--- a/test-ansible-functional.sh
+++ b/test-ansible-functional.sh
@@ -67,10 +67,9 @@ function setup_ara {
   [[ -L "${ANSIBLE_PLUGIN_DIR}/callback/ara" ]] && return 0
 
   # Install ARA from source if running in ARA gate, otherwise install from PyPi
-  if [[ -d "${TESTING_HOME}/git/openstack/ara" ]]; then
-    pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" "${TESTING_HOME}/git/openstack/ara"
-  elif [[ "${ZUUL_PROJECT}" == "openstack/ara" ]]; then
-    pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" "${WORKING_DIR}"
+  ARA_SRC_HOME="${TESTING_HOME}/src/git.openstack.org/openstack/ara"
+  if [[ -d "${ARA_SRC_HOME}" ]]; then
+    pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" "${ARA_SRC_HOME}"
   else
     pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" ara
   fi