From 2af6d90408475fe5987d66909e299cb253e0c2c9 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 25 Oct 2017 11:49:32 +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: I3b31fdadae62d8558dc995b15dd51d4ffa50bd78 --- scripts/gate-check-commit.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh index b77d787cf8..7a789c8ccb 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -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}"