From: "Philippe Mathieu-Daudé via" <qemu-devel@nongnu.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Michael Tokarev" <mjt@tls.msk.ru>,
"Daniel P . Berrangé" <berrange@redhat.com>,
qemu-block@nongnu.org, "Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Yonggang Luo" <luoyonggang@gmail.com>,
"Peter Maydell" <peter.maydell@linaro.org>
Subject: [PATCH v4 3/8] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files
Date: Fri, 21 Jan 2022 11:36:18 +0100 [thread overview]
Message-ID: <20220121103623.288054-4-f4bug@amsat.org> (raw)
In-Reply-To: <20220121103623.288054-1-f4bug@amsat.org>
The script only include the local qemu.yml for Dockerfiles.
Since we want to keep the Cirrus-CI generated files in sync,
also use the --data-dir option in generate_cirrus().
Fixes: c45a540f4bd (".gitlab-ci.d/cirrus: auto-generate variables with lcitool")
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
tests/lcitool/refresh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 033120e223d..25301f2ef0b 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=None, trailer=None):
def generate_cirrus(target, trailer=None):
filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars")
- cmd = [lcitool_path, "variables", target, "qemu"]
+ cmd = lcitool_cmd + ["variables", target, "qemu"]
generate(filename, cmd, trailer)
ubuntu1804_skipssh = [
--
2.34.1
next prev parent reply other threads:[~2022-01-21 11:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-21 10:36 [PATCH v4 0/8] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
2022-01-21 10:36 ` [PATCH v4 1/8] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé via
2022-01-21 11:35 ` Thomas Huth
2022-01-21 10:36 ` [PATCH v4 2/8] gitmodules: Correct libvirt-ci URL Philippe Mathieu-Daudé via
2022-01-21 10:46 ` Philippe Mathieu-Daudé via
2022-01-21 10:47 ` Daniel P. Berrangé
2022-01-21 11:36 ` Thomas Huth
2022-01-21 10:36 ` Philippe Mathieu-Daudé via [this message]
2022-01-21 10:36 ` [PATCH v4 4/8] tests: Refresh lcitool submodule Philippe Mathieu-Daudé via
2022-01-21 11:40 ` Thomas Huth
2022-01-21 11:47 ` Daniel P. Berrangé
2022-01-21 14:30 ` Warner Losh
2022-01-21 14:34 ` Daniel P. Berrangé
2022-01-21 15:37 ` Philippe Mathieu-Daudé via
2022-01-21 10:36 ` [PATCH v4 5/8] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Philippe Mathieu-Daudé via
2022-01-21 10:36 ` [PATCH v4 6/8] drop libxml2 checks since libxml is not actually used (for parallels) Philippe Mathieu-Daudé via
2022-01-21 11:45 ` Thomas Huth
2022-01-21 10:36 ` [PATCH v4 7/8] tests/lcitool: Remove libxml2 Philippe Mathieu-Daudé via
2022-01-21 11:47 ` Thomas Huth
2022-01-21 12:50 ` Philippe Mathieu-Daudé via
2022-01-21 10:36 ` [PATCH v4 8/8] tests: Manually remove libxml2 on MSYS2 runners Philippe Mathieu-Daudé via
2022-01-21 11:49 ` Thomas Huth
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=20220121103623.288054-4-f4bug@amsat.org \
--to=qemu-devel@nongnu.org \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=f4bug@amsat.org \
--cc=luoyonggang@gmail.com \
--cc=mjt@tls.msk.ru \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@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).