From 5946ab0c3157bfc7fd3559f1c062ede204fa0474 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Sat, 25 Jun 2022 08:26:56 +0100
Subject: [PATCH] Switch ARA report type from html to database for
 openstack-ansible jobs

The sqlite database is useful for post-processing ARA reports. The HTML
generation makes thousands of files which can take a very long time
to upload to a swift endpoint.

Also fix the collection location for the ARA sqlite file.

Change-Id: I754e236594eddc7b80cbb293ebb9ae217c864c62
---
 scripts/log-collect.sh | 2 +-
 zuul.d/jobs.yaml       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/log-collect.sh b/scripts/log-collect.sh
index 5ca82f2e14..c1f83b9d7a 100755
--- a/scripts/log-collect.sh
+++ b/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"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3821a5cfde..2d62e3ed8c 100644
--- a/zuul.d/jobs.yaml
+++ b/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