From: Erik Skultety <eskultet@redhat.com>
Date: Fri, 14 Oct 2022 10:24:59 +0000 (+0200)
Subject: ci: integration: Create the avocado logs artifact dir conditionally
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2b26127397056339b6ac15c0f89e7369029e464e;p=libvirt.git

ci: integration: Create the avocado logs artifact dir conditionally

Don't create an avocado directory in the resulting log artifacts
if Avocado didn't even run (e.g. libvirt errored out on service
restart).

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/ci/integration-template.yml b/ci/integration-template.yml
index 67982c5167..48e71e2dd9 100644
--- a/ci/integration-template.yml
+++ b/ci/integration-template.yml
@@ -57,7 +57,7 @@
 .collect-logs: &collect-logs
   - set +e
   - mkdir logs
-  - test -d "$SCRATCH_DIR"/avocado && sudo mv "$SCRATCH_DIR"/avocado/latest/test-results logs/avocado;
+  - test -d "$SCRATCH_DIR"/avocado && mkdir logs/avocado
   - sudo coredumpctl &>/dev/null && sudo coredumpctl info --no-pager > logs/coredumpctl.txt
   - sudo mv /var/log/libvirt logs/libvirt
   - sudo chown -R $(whoami):$(whoami) logs