openstack/openstack-ansible
Code Issues Proposed changes

Run ARA only if enabled

Browse Source 
Adds a switch to disable the ARA static site generation in the exit
tasks if the environment has disabled it.

Change-Id: I814f7bd77d13e049c0a24745f49f4c5ef5999bc4
This commit is contained in:
Logan V 2017-08-06 01:04:30 -05:00
parent ca76327d54
commit d03f39c06d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/scripts-library.sh
View File

@ -24,6 +24,7 @@ COMMAND_LOGS=${COMMAND_LOGS:-"/openstack/log/ansible_cmd_logs"}
GATE_EXIT_LOG_COPY="${GATE_EXIT_LOG_COPY:-false}" GATE_EXIT_LOG_COPY="${GATE_EXIT_LOG_COPY:-false}"
GATE_EXIT_LOG_GZIP="${GATE_EXIT_LOG_GZIP:-true}" GATE_EXIT_LOG_GZIP="${GATE_EXIT_LOG_GZIP:-true}"
GATE_EXIT_RUN_ARA="${GATE_EXIT_RUN_ARA:-true}"
# If this is a gate node from OpenStack-Infra Store all logs into the # If this is a gate node from OpenStack-Infra Store all logs into the
# execution directory after gate run. # execution directory after gate run.
if [[ -d "/etc/nodepool" ]]; then if [[ -d "/etc/nodepool" ]]; then
@ -134,9 +135,11 @@ function gate_job_exit_tasks {
# except tempest results testrepository.subunit and testr_results.html # except tempest results testrepository.subunit and testr_results.html
find "${GATE_LOG_DIR}/" -type f -not -name "testrepository.subunit" -not -name "testr_results.html" -exec mv {} {}.txt \; find "${GATE_LOG_DIR}/" -type f -not -name "testrepository.subunit" -not -name "testr_results.html" -exec mv {} {}.txt \;
# Generate the ARA report # Generate the ARA report if enabled
/opt/ansible-runtime/bin/ara generate html "${GATE_LOG_DIR}/ara" || true if [ "$GATE_EXIT_RUN_ARA" == true ]; then
/opt/ansible-runtime/bin/ara generate subunit "${GATE_LOG_DIR}/ara/testrepository.subunit" || true /opt/ansible-runtime/bin/ara generate html "${GATE_LOG_DIR}/ara" || true
/opt/ansible-runtime/bin/ara generate subunit "${GATE_LOG_DIR}/ara/testrepository.subunit" || true
fi
# Compress the files gathered so that they do not take up too much space. # Compress the files gathered so that they do not take up too much space.
# We use 'command' to ensure that we're not executing with some sort of alias. # We use 'command' to ensure that we're not executing with some sort of alias.
if [ "$GATE_EXIT_LOG_GZIP" == true ]; then if [ "$GATE_EXIT_LOG_GZIP" == true ]; then