Merge "Switch ARA report type from html to database for openstack-ansible jobs" into stable/wallaby

scripts/log-collect.sh

@@ -154,7 +154,7 @@ if [[ "$ARA_REPORT_TYPE" == "html" ]]; then
 fi
 
 # Store the ara sqlite database in the openstack-ci expected path
-store_artifacts "${TESTING_HOME}/.ara/ansible.sqlite" "${WORKING_DIR}/logs/ara-report/"
+store_artifacts "${TESTING_HOME}/.ara/server/ansible.sqlite" "${WORKING_DIR}/logs/ara-report/"
 
 # Store netstat report
 store_artifacts /tmp/listening_port_report.txt "${WORKING_DIR}/logs/host"

zuul.d/jobs.yaml

@@ -35,6 +35,9 @@
       - ^setup\.(cfg|py)$
       - ^tox.ini$
       - ^Vagrantfile
+    vars:
+      #disable generation of ARA html report to reduce log upload time
+      ara_report_type: database
 
 - job:
     name: openstack-ansible-deploy-aio-distro