openstack/openstack-ansible
Code Issues Proposed changes

Install current ARA version into the ansible-runtime venv

Browse Source 
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
This commit is contained in:
Jonathan Rosser 2019-09-17 10:00:18 +01:00
parent 855a52ecbf
commit 1fec15cfdc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/log-collect.sh
View File

@ -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

4
scripts/scripts-library.sh
View File

@ -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
}