From: Daniel P. Berrangé <berra...@redhat.com>
The junit XML file produced by meson does not always have the
name 'testlog.junit.xml' - in the case of 'make check-functional'
there is a 'testlog-thorough.junit.xml' file too.
Improve CI debugging robustness by capturing all junit files that
meson produces.
Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
Message-ID: <20250908190901.3571859-4-berra...@redhat.com>
Signed-off-by: Thomas Huth <th...@redhat.com>
---
.gitlab-ci.d/buildtest-template.yml | 4 ++--
.gitlab-ci.d/buildtest.yml | 2 +-
.gitlab-ci.d/crossbuild-template.yml | 2 +-
.gitlab-ci.d/custom-runners.yml | 2 +-
.gitlab-ci.d/windows.yml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.d/buildtest-template.yml
b/.gitlab-ci.d/buildtest-template.yml
index 4cc5b20790f..308490a35ac 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -90,7 +90,7 @@
paths:
- build/meson-logs
reports:
- junit: build/meson-logs/testlog.junit.xml
+ junit: build/meson-logs/*.junit.xml
.functional_test_job_template:
extends: .common_test_job_template
@@ -107,7 +107,7 @@
- build/meson-logs
- build/tests/functional/*/*/*.log
reports:
- junit: build/meson-logs/testlog.junit.xml
+ 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
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 778289267f1..83c2867295a 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -615,7 +615,7 @@ gcov:
paths:
- build/meson-logs
reports:
- junit: build/meson-logs/testlog.junit.xml
+ junit: build/meson-logs/*.junit.xml
coverage_report:
coverage_format: cobertura
path: build/coverage.xml
diff --git a/.gitlab-ci.d/crossbuild-template.yml
b/.gitlab-ci.d/crossbuild-template.yml
index 7e70376cfcc..58136d06e4a 100644
--- a/.gitlab-ci.d/crossbuild-template.yml
+++ b/.gitlab-ci.d/crossbuild-template.yml
@@ -130,4 +130,4 @@
paths:
- build/meson-logs
reports:
- junit: build/meson-logs/testlog.junit.xml
+ junit: build/meson-logs/*.junit.xml
diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
index 1aa3c60efe9..2d493f70f7a 100644
--- a/.gitlab-ci.d/custom-runners.yml
+++ b/.gitlab-ci.d/custom-runners.yml
@@ -26,7 +26,7 @@
- build/build.ninja
- build/meson-logs
reports:
- junit: build/meson-logs/testlog.junit.xml
+ junit: build/meson-logs/*.junit.xml
include:
- local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml'
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index f14e9ca1341..1e6a01bd9ac 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -26,7 +26,7 @@ msys2-64bit:
paths:
- build/meson-logs
reports:
- junit: "build/meson-logs/testlog.junit.xml"
+ junit: build/meson-logs/*.junit.xml
before_script:
- Write-Output "Acquiring msys2.exe installer at $(Get-Date -Format u)"
- If ( !(Test-Path -Path msys64\var\cache ) ) {
--
2.51.0
