From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 16/23] gitlab: include all junit XML files from meson
Date: Tue, 9 Sep 2025 15:51:40 +0200 [thread overview]
Message-ID: <20250909135147.612345-17-thuth@redhat.com> (raw)
In-Reply-To: <20250909135147.612345-1-thuth@redhat.com>
From: Daniel P. Berrangé <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>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-ID: <20250908190901.3571859-4-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@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
next prev parent reply other threads:[~2025-09-09 13:54 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-09 13:51 [PULL 00/23] Functional tests and misc patches Thomas Huth
2025-09-09 13:51 ` [PULL 01/23] hw/display/bcm2835_fb: Move inclusion of console.h to the .c file Thomas Huth
2025-09-09 13:51 ` [PULL 02/23] Revert "meson.build: Disable -fzero-call-used-regs on OpenBSD" Thomas Huth
2025-09-09 13:51 ` [PULL 03/23] hw/mips/malta: Silence warning from ubsan Thomas Huth
2025-09-09 13:51 ` [PULL 04/23] system/physmem: " Thomas Huth
2025-09-15 16:17 ` Richard Henderson
2025-09-09 13:51 ` [PULL 05/23] ui/vnc: Fix crash when specifying [vnc] without id in the config file Thomas Huth
2025-09-09 13:51 ` [PULL 06/23] tests/functional/m68k: Avoid ResourceWarning in the nextcube test Thomas Huth
2025-09-09 13:51 ` [PULL 07/23] tests/functional: enable force refresh of cached assets Thomas Huth
2025-09-09 13:51 ` [PULL 08/23] tests/functional: fix formatting of exception args Thomas Huth
2025-09-09 13:51 ` [PULL 09/23] tests/functional: handle URLError when fetching assets Thomas Huth
2025-09-09 13:51 ` [PULL 10/23] tests/functional/arm: Update test ASPEED SDK v03.02 for AST1030 Thomas Huth
2025-09-09 13:51 ` [PULL 11/23] tests/functional/arm: Update test ASPEED SDK v09.07 for AST2500 Thomas Huth
2025-09-09 13:51 ` [PULL 12/23] tests/functional/arm: Update test ASPEED SDK v09.07 for AST2600 Thomas Huth
2025-09-09 13:51 ` [PULL 13/23] tests/functional/arm: Update test ASPEED SDK v09.07 for AST2700 vbootrom Thomas Huth
2025-09-09 13:51 ` [PULL 14/23] gitlab: replace avocado results files with meson results files Thomas Huth
2025-09-09 13:51 ` [PULL 15/23] gitlab: always include entire of meson-logs directory Thomas Huth
2025-09-09 13:51 ` Thomas Huth [this message]
2025-09-09 13:51 ` [PULL 17/23] gitlab: prevent duplicated meson log artifacts in test jobs Thomas Huth
2025-09-09 13:51 ` [PULL 18/23] tests/functional: return output from cmd.py helpers Thomas Huth
2025-09-09 13:51 ` [PULL 19/23] tests/functional: add vm param to " Thomas Huth
2025-09-09 13:51 ` [PULL 20/23] tests/functional: fix infinite loop on console EOF Thomas Huth
2025-09-09 13:51 ` [PULL 21/23] tests/functional: avoid duplicate messages on failures Thomas Huth
2025-09-09 13:51 ` [PULL 22/23] tests/functional: avoid tearDown failure when QEMU dies Thomas Huth
2025-09-09 13:51 ` [PULL 23/23] tests/functional: purge scratch dir on test startup Thomas Huth
2025-09-11 13:12 ` [PULL 00/23] Functional tests and misc patches Peter Maydell
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=20250909135147.612345-17-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).