[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/26] tests/lcitool: Include local qemu.yml when refreshing c
From: |
Alex Bennée |
Subject: |
[PATCH v3 07/26] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files |
Date: |
Fri, 4 Feb 2022 20:43:16 +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>
Message-Id: <20220124201608.604599-8-alex.bennee@linaro.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
- Re: [PATCH v3 01/26] tests/Makefile.include: clean-up old code, (continued)
- [PATCH v3 02/26] tests/qtest: enable more vhost-user tests by default, Alex Bennée, 2022/02/04
- [PATCH v3 04/26] .gitignore: add .gcov pattern, Alex Bennée, 2022/02/04
- [PATCH v3 03/26] Makefile: also remove .gcno files when cleaning, Alex Bennée, 2022/02/04
- [PATCH v3 06/26] gitmodules: Correct libvirt-ci submodule URL, Alex Bennée, 2022/02/04
- [PATCH v3 05/26] MAINTAINERS: Cover lcitool submodule with build test / automation, Alex Bennée, 2022/02/04
- [PATCH v3 08/26] drop libxml2 checks since libxml is not actually used (for parallels), Alex Bennée, 2022/02/04
- [PATCH v3 07/26] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files,
Alex Bennée <=
- [PATCH v3 13/26] gitlab: fall back to commit hash in qemu-setup filename, Alex Bennée, 2022/02/04
- [PATCH v3 10/26] tests: Manually remove libxml2 on MSYS2 runners, Alex Bennée, 2022/02/04
- [PATCH v3 09/26] tests/lcitool: Refresh submodule and remove libxml2, Alex Bennée, 2022/02/04
- [PATCH v3 11/26] tests/lcitool: Install libibumad to cover RDMA on Debian based distros, Alex Bennée, 2022/02/04
- [PATCH v3 12/26] docs/devel: mention our .editorconfig, Alex Bennée, 2022/02/04
- [PATCH v3 14/26] tests/lcitool: Allow lcitool-refresh in out-of-tree builds, too, Alex Bennée, 2022/02/04
- [PATCH v3 26/26] plugins: move reset of plugin data to tb_start, Alex Bennée, 2022/02/04
- [PATCH v3 24/26] tests/plugins: add instruction matching to libinsn.so, Alex Bennée, 2022/02/04