openstack
/
openstack-ansible-tests
Code Issues Proposed changes

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
This commit is contained in:
Jesse Pretorius 2017-10-25 11:44:20 +01:00
parent 2cdefa5946
commit 5667c17b1b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test-ansible-functional.sh
View File

@ -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