From 1fec15cfdc77600bcaee201c6e5f1297d0ebab13 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 17 Sep 2019 10:00:18 +0100 Subject: [PATCH] Install current ARA version into the ansible-runtime venv Modern ARA no longer has ansible in its requirements file so we can remove also passing ANSIBLE_PACKAGE to the installation command. We will already have ansible / ansible-base in the ansible-runtime venv from previous steps in bootstrap-ansible.sh Change-Id: Ic7840d4c64b49c2eccea3dba4798cb5b26b2594c --- scripts/log-collect.sh | 2 +- scripts/scripts-library.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/log-collect.sh b/scripts/log-collect.sh index 53296c77ca..a74ac96164 100755 --- a/scripts/log-collect.sh +++ b/scripts/log-collect.sh @@ -173,7 +173,7 @@ store_artifacts /var/log/ "${WORKING_DIR}/logs/host" # Build the ARA static html report if required if [[ "$ARA_REPORT_TYPE" == "html" ]]; then echo "Generating ARA static html report." - /opt/ansible-runtime/bin/ara generate html "${WORKING_DIR}/logs/ara-report" + /opt/ansible-runtime/bin/ara-manage generate "${WORKING_DIR}/logs/ara-report" fi # Store the ara sqlite database in the openstack-ci expected path diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index c355aa492b..8fd08f8886 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -207,12 +207,12 @@ function setup_ara { # 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} "${ANSIBLE_PACKAGE:-ansible}" + ${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<1.0.0' "${ANSIBLE_PACKAGE:-ansible}" + ${PIP_COMMAND} install --isolated ${PIP_OPTS} "ara[server]" fi }