openstack/openstack-ansible-tests
Code Issues Proposed changes

Merge "Use zuul v3 src location to install ARA"

Browse Source
This commit is contained in:
Zuul 2017-11-01 06:04:24 +00:00 committed by Gerrit Code Review
commit d3b0998f9f
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 [[ -L "${ANSIBLE_PLUGIN_DIR}/callback/ara" ]] && return 0
# Install ARA from source if running in ARA gate, otherwise install from PyPi # Install ARA from source if running in ARA gate, otherwise install from PyPi
if [[ -d "${TESTING_HOME}/git/openstack/ara" ]]; then ARA_SRC_HOME="${TESTING_HOME}/src/git.openstack.org/openstack/ara"
pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" "${TESTING_HOME}/git/openstack/ara" if [[ -d "${ARA_SRC_HOME}" ]]; then
elif [[ "${ZUUL_PROJECT}" == "openstack/ara" ]]; then pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" "${ARA_SRC_HOME}"
pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" "${WORKING_DIR}"
else else
pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" ara pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" ara
fi fi