gitlab: ensure "check-XXX' jobs capture functional test logs

[PATCH] gitlab: ensure "check-XXX' jobs capture functional test logs

Posted by Daniel P. Berrangé 1 month, 2 weeks ago

A small subset of functional tests are run by default with
'make check', and so run in the context of 'check-XXX' CI
jobs, rather than 'functional-XXX' CI jobs.  Thus we need
to capture the functional test logs unconditionally for all
test jobs.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 .gitlab-ci.d/buildtest-template.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml
index 005058625e..3b003abc99 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -78,6 +78,15 @@
   extends: .meson_job_template
   stage: test
   image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+    when: always
+    expire_in: 7 days
+    paths:
+      - build/meson-logs
+      - build/tests/functional/*/*/*.log
+    reports:
+      junit: build/meson-logs/*.junit.xml
   script:
     - source scripts/ci/gitlab-ci-section
     - section_start buildenv "Setting up to run tests"
@@ -111,15 +120,6 @@
     paths:
       - ${CI_PROJECT_DIR}/functional-cache
     policy: pull-push
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
-    when: always
-    expire_in: 7 days
-    paths:
-      - build/meson-logs
-      - build/tests/functional/*/*/*.log
-    reports:
-      junit: build/meson-logs/*.junit.xml
   before_script:
     - export QEMU_TEST_ALLOW_UNTRUSTED_CODE=1
     - export QEMU_TEST_CACHE_DIR=${CI_PROJECT_DIR}/functional-cache
-- 
2.54.0

Re: [PATCH] gitlab: ensure "check-XXX' jobs capture functional test logs

Posted by Alex Bennée 1 month ago

Daniel P. Berrangé <berrange@redhat.com> writes:

> A small subset of functional tests are run by default with
> 'make check', and so run in the context of 'check-XXX' CI
> jobs, rather than 'functional-XXX' CI jobs.  Thus we need
> to capture the functional test logs unconditionally for all
> test jobs.

Queued to testing/next, thanks.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH] gitlab: ensure "check-XXX' jobs capture functional test logs

Posted by Pierrick Bouvier 1 month, 2 weeks ago

On 6/10/2026 5:12 AM, Daniel P. Berrangé wrote:
> A small subset of functional tests are run by default with
> 'make check', and so run in the context of 'check-XXX' CI
> jobs, rather than 'functional-XXX' CI jobs.  Thus we need
> to capture the functional test logs unconditionally for all
> test jobs.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  .gitlab-ci.d/buildtest-template.yml | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>