.gitlab-ci.d/cirrus: auto-generate variables with lcitool

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é <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20211215141949.3512719-15-berrange@redhat.com>
Message-Id: <20220105135009.1584676-15-alex.bennee@linaro.org>
This commit is contained in:
Daniel P. Berrangé 2022-01-05 13:49:49 +00:00 committed by Alex Bennée
parent 6815e63f31
commit c45a540f4b
4 changed files with 30 additions and 13 deletions

View file

@ -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)