From: Philippe Mathieu-Daudé Date: Fri, 4 Feb 2022 20:43:16 +0000 (+0000) Subject: tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files X-Git-Tag: v7.0.0-rc0~59^2~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d3539d561d028263ea21e577fcadd12ff8abcc6;p=thirdparty%2Fqemu.git tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files 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é Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-4-f4bug@amsat.org> Message-Id: <20220204204335.1689602-8-alex.bennee@linaro.org> --- 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 = [