[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/7] tests/lcitool: Include local qemu.yml when refreshing cir
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 2/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files |
Date: |
Thu, 20 Jan 2022 12:30:11 +0100 |
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>
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
- [PATCH v3 0/7] tests: Refresh lcitool submodule & remove libxml2, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 7/7] tests: Manually remove libxml2 on MSYS2 runners, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 5/7] drop libxml2 checks since libxml is not actually used (for parallels), Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 3/7] tests: Refresh lcitool submodule, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 4/7] tests/lcitool: Install libibumad to cover RDMA on Debian based distros, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 2/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files,
Philippe Mathieu-Daudé <=
- [PATCH v3 6/7] tests/lcitool: Remove libxml2, Philippe Mathieu-Daudé, 2022/01/20