[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 07/22] tests/lcitool: Include local qemu.yml when refreshing c
From: |
Alex Bennée |
Subject: |
[PATCH v1 07/22] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files |
Date: |
Mon, 24 Jan 2022 20:15:53 +0000 |
From: Philippe Mathieu-Daudé <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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220121154134.315047-4-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 033120e223..25301f2ef0 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.30.2
- [PATCH v1 00/22] testing and plugin updates, Alex Bennée, 2022/01/24
- [PATCH v1 01/22] tests/Makefile.include: clean-up old code, Alex Bennée, 2022/01/24
- [PATCH v1 02/22] tests/qtest: enable more vhost-user tests by default, Alex Bennée, 2022/01/24
- [PATCH v1 07/22] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files,
Alex Bennée <=
- [PATCH v1 05/22] MAINTAINERS: Cover lcitool submodule with build test / automation, Alex Bennée, 2022/01/24
- [PATCH v1 04/22] .gitignore: add .gcov pattern, Alex Bennée, 2022/01/24
- [PATCH v1 03/22] Makefile: also remove .gcno files when cleaning, Alex Bennée, 2022/01/24
- [PATCH v1 06/22] gitmodules: Correct libvirt-ci submodule URL, Alex Bennée, 2022/01/24
- [PATCH v1 12/22] plugins: stxp test case from Aaron (!upstream), Alex Bennée, 2022/01/24
- [PATCH v1 08/22] drop libxml2 checks since libxml is not actually used (for parallels), Alex Bennée, 2022/01/24