openstack/openstack-ansible
Code Issues Proposed changes

Use zuul v3 src location to install ARA

Browse Source 
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: I3b31fdadae62d8558dc995b15dd51d4ffa50bd78
This commit is contained in:
Jesse Pretorius 2017-10-25 11:49:32 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 1fe7d72139
commit 2af6d90408
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/gate-check-commit.sh
View File

@ -113,9 +113,10 @@ source "${OSA_CLONE_DIR}/scripts/bootstrap-ansible.sh"
# Install ARA and add it to the callback path provided by bootstrap-ansible.sh/openstack-ansible.rc
# This is added *here* instead of bootstrap-ansible so it's used for CI purposes only.
if [[ -d "/tmp/openstack/ara" ]]; then
ARA_SRC_HOME="${HOME}/src/git.openstack.org/openstack/ara"
if [[ -d "${ARA_SRC_HOME}" ]]; then
# This installs from a git checkout
/opt/ansible-runtime/bin/pip install /tmp/openstack/ara "${ANSIBLE_PACKAGE:-ansible}"
/opt/ansible-runtime/bin/pip install ${ARA_SRC_HOME} "${ANSIBLE_PACKAGE:-ansible}"
else
# This installs from pypi
/opt/ansible-runtime/bin/pip install ara "${ANSIBLE_PACKAGE:-ansible}"