From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Yonggang Luo" <luoyonggang@gmail.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH 3/4] gitlab: include all junit XML files from meson
Date: Mon, 8 Sep 2025 20:09:00 +0100 [thread overview]
Message-ID: <20250908190901.3571859-4-berrange@redhat.com> (raw)
In-Reply-To: <20250908190901.3571859-1-berrange@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é <berrange@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 4cc5b20790..308490a35a 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 778289267f..83c2867295 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 7e70376cfc..58136d06e4 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 1aa3c60efe..2d493f70f7 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 f14e9ca134..1e6a01bd9a 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.50.1
next prev parent reply other threads:[~2025-09-08 19:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-08 19:08 [PATCH 0/4] gitlab: misc artifact / log handling fixes Daniel P. Berrangé
2025-09-08 19:08 ` [PATCH 1/4] gitlab: replace avocado results files with meson results files Daniel P. Berrangé
2025-09-08 21:20 ` Alex Bennée
2025-09-08 19:08 ` [PATCH 2/4] gitlab: always include entire of meson-logs directory Daniel P. Berrangé
2025-09-08 21:20 ` Alex Bennée
2025-09-08 19:09 ` Daniel P. Berrangé [this message]
2025-09-08 21:20 ` [PATCH 3/4] gitlab: include all junit XML files from meson Alex Bennée
2025-09-08 19:09 ` [PATCH 4/4] gitlab: prevent duplicated meson log artifacts in test jobs Daniel P. Berrangé
2025-09-08 21:21 ` Alex Bennée
2025-09-09 7:04 ` Daniel P. Berrangé
2025-09-09 8:46 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250908190901.3571859-4-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=luoyonggang@gmail.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).