From c45a540f4bd47b2947edf585c89bbfdc338eaef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 5 Jan 2022 13:49:49 +0000 Subject: .gitlab-ci.d/cirrus: auto-generate variables with lcitool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current Cirrus CI variables files were previously generated by using lcitool. This change wires them up to the refresh script to make that link explicit. This changes the package list because libvirt-ci now knows about the mapping for dtc on FreeBSD and macOS platforms. The variables are also now emit in sorted order for stability across runs. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20211215141949.3512719-15-berrange@redhat.com> Message-Id: <20220105135009.1584676-15-alex.bennee@linaro.org> --- tests/lcitool/refresh | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tests') diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index b8a69ce..b8cf0a7 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -60,6 +60,11 @@ def generate_dockerfile(host, target, cross=None, trailer=None): cmd.extend([target, "qemu"]) generate(filename, cmd, trailer) +def generate_cirrus(target, trailer=None): + filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") + cmd = [lcitool_path, "variables", target, "qemu"] + generate(filename, cmd, trailer) + ubuntu1804_skipssh = [ "# https://bugs.launchpad.net/qemu/+bug/1838763\n", "ENV QEMU_CONFIGURE_OPTS --disable-libssh\n" @@ -79,6 +84,11 @@ try: generate_dockerfile("ubuntu2004", "ubuntu-2004", trailer="".join(ubuntu2004_tsanhack)) generate_dockerfile("opensuse-leap", "opensuse-leap-152") + + generate_cirrus("freebsd-12") + generate_cirrus("freebsd-13") + generate_cirrus("macos-11") + sys.exit(0) except Exception as ex: print(str(ex), file=sys.stderr) -- cgit v1.1