From 967c5d4e2ac59400f5494eba1704c430a163ed84 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Thu, 25 Feb 2021 17:21:10 -0500 Subject: [PATCH] scripts-library: simplify ara setup The intent was to be able to test easily with Depends-On patches with a repository prepared by Zuul but ara is being retired from opendev.org/recordsansible/ara and will no longer be available at that location. Change-Id: Ic628788e2f9b437a275b01d8721b75c76ed91acb --- scripts/scripts-library.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index 66f4e20f20..b2a8dffd9b 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -199,18 +199,9 @@ function gate_job_exit_tasks { function setup_ara { # 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. - ARA_SRC_HOME="${HOME}/src/opendev.org/recordsansible/ara" - if [[ -d "${ARA_SRC_HOME}" ]]; then - # This installs from a git checkout - # PIP_COMMAND and PIP_OPTS are exported by the bootstrap-ansible script. - # PIP_OPTS contains the whole set of constraints that need to be applied. - ${PIP_COMMAND} install --isolated ${PIP_OPTS} ${ARA_SRC_HOME} - else - # This installs from pypi - # PIP_COMMAND and PIP_OPTS are exported by the bootstrap-ansible script. - # PIP_OPTS contains the whole set of constraints that need to be applied. - ${PIP_COMMAND} install --isolated ${PIP_OPTS} "ara[server]" - fi + # PIP_COMMAND and PIP_OPTS are exported by the bootstrap-ansible script. + # PIP_OPTS contains the whole set of constraints that need to be applied. + ${PIP_COMMAND} install --isolated ${PIP_OPTS} "ara[server]" } function run_dstat {