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 4/4] gitlab: prevent duplicated meson log artifacts in test jobs
Date: Mon, 8 Sep 2025 20:09:01 +0100 [thread overview]
Message-ID: <20250908190901.3571859-5-berrange@redhat.com> (raw)
In-Reply-To: <20250908190901.3571859-1-berrange@redhat.com>
The build jobs will populate build/meson-logs/ with various files
that are added as artifacts.
The test jobs preserve the state of the build jobs, so we must
delete any pre-existing logs to prevent confusion from duplicate
artifacts.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
.gitlab-ci.d/buildtest-template.yml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml
index 308490a35a..d866cb12bb 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -83,6 +83,10 @@
.native_test_job_template:
extends: .common_test_job_template
+ before_script:
+ # Prevent logs from the build job that run earlier
+ # from being duplicated in the test job artifacts
+ - rm -f build/meson-logs/*
artifacts:
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
when: always
@@ -111,6 +115,9 @@
before_script:
- export QEMU_TEST_ALLOW_UNTRUSTED_CODE=1
- export QEMU_TEST_CACHE_DIR=${CI_PROJECT_DIR}/functional-cache
+ # Prevent logs from the build job that run earlier
+ # from being duplicated in the test job artifacts
+ - rm -f build/meson-logs/*
after_script:
- cd build
- du -chs ${CI_PROJECT_DIR}/*-cache
--
2.50.1
next prev parent reply other threads:[~2025-09-08 19:15 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 ` [PATCH 3/4] gitlab: include all junit XML files from meson 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:21 ` [PATCH 4/4] gitlab: prevent duplicated meson log artifacts in test jobs 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-5-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).