SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files

Browse Source 
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: <20220204204335.1689602-8-alex.bennee@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2022-02-04 20:43:16 +00:00 committed by Alex Bennée
parent 9641ba6b58
commit 5d3539d561
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/lcitool/refresh
View File

@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=None, trailer=None):
def generate_cirrus(target, trailer=None): def generate_cirrus(target, trailer=None):
filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") 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) generate(filename, cmd, trailer)
ubuntu1804_skipssh = [ ubuntu1804_skipssh = [