openstack/openstack-ansible-tests
Code Issues Proposed changes

Default to modern ARA for functional tests

Browse Source 
Change-Id: Id1f8b951581f715a9cf36c7ebac1065a88f8d8cd
This commit is contained in:
Jonathan Rosser 2020-09-30 20:35:03 +01:00
parent df1480576b
commit 2378e56655
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test-ansible-env-prep.sh
View File

@ -201,11 +201,7 @@ ARA_SRC_HOME="${TESTING_HOME}/src/opendev.org/recordsansible/ara"
if [[ -d "${ARA_SRC_HOME}" ]]; then if [[ -d "${ARA_SRC_HOME}" ]]; then
PIP_OPTS+=" ${ARA_SRC_HOME}" PIP_OPTS+=" ${ARA_SRC_HOME}"
else else
if [[ ${VERSION_ID} == "8" && ${ID} == "centos" ]]; then PIP_OPTS+=" ara[server]"
PIP_OPTS+=" ara<1.0.0;python_version<'3.0' ara[server];python_version>='3.0'"
else
PIP_OPTS+=" ara<1.0.0"
fi
fi fi
# Install all python packages # Install all python packages

10
test-log-collect.sh
View File

@ -202,14 +202,8 @@ store_artifacts /var/log/ "${WORKING_DIR}/logs/host"
# ARA from. # ARA from.
source /etc/os-release || source /usr/lib/os-release source /etc/os-release || source /usr/lib/os-release
if [[ ${VERSION_ID} == "8" && ${ID} == "centos" ]]; then ARA_CMD="$(find ${WORKING_DIR}/.tox -path "*/bin/ara-manage" -type f | head -n 1)"
#centos-8 is pinned to ara>=1.0 ARA_OPTIONS="generate ${WORKING_DIR}/logs/ara-report"
ARA_CMD="$(find ${WORKING_DIR}/.tox -path "*/bin/ara-manage" -type f | head -n 1)"
ARA_OPTIONS="generate ${WORKING_DIR}/logs/ara-report"
else
ARA_CMD="$(find ${WORKING_DIR}/.tox -path "*/bin/ara" -type f | head -n 1)"
ARA_OPTIONS="generate html ${WORKING_DIR}/logs/ara-report"
fi
if [[ "${ARA_CMD}" != "" ]]; then if [[ "${ARA_CMD}" != "" ]]; then
echo "Generating ARA static html report." echo "Generating ARA static html report."