Skip to contentSkip to conversation

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

PATCH In review Daniel P. Berrangé 3 participants 3 messages Jun 10 – Jun 19

lore
Share & tools
lore
#0 lore raw

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

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.

---
 .gitlab-ci.d/buildtest-template.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
.gitlab-ci.d/buildtest-template.yml +9 -9
index 005058625e..3b003abc99 100644
@@ -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
Signature · 1 line
2.54.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Daniel P. Berrangé

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.

---
 .gitlab-ci.d/buildtest-template.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
#2 lore raw
In reply to Daniel P. Berrangé
Quoted 5 lines · Daniel P. Berrangé

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.

Signature · 2 lines
Alex Bennée
Virtualisation Tech Lead @ Linaro