diff options
| author | Daniel P. Berrangé | 2022-01-05 14:49:49 +0100 |
|---|---|---|
| committer | Alex Bennée | 2022-01-18 17:42:42 +0100 |
| commit | c45a540f4bd47b2947edf585c89bbfdc338eaef7 (patch) | |
| tree | 80ed60a9f697524be791cee8f53fede5cd4becc3 /tests | |
| parent | tests/docker: remove ubuntu.docker container (diff) | |
| download | qemu-c45a540f4bd47b2947edf585c89bbfdc338eaef7.tar.gz qemu-c45a540f4bd47b2947edf585c89bbfdc338eaef7.tar.xz qemu-c45a540f4bd47b2947edf585c89bbfdc338eaef7.zip | |
.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>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/lcitool/refresh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index b8a69cee59..b8cf0a7386 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) |