From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v4 14/18] .gitlab-ci.d/cirrus: auto-generate variables with lcitool
Date: Wed, 24 Nov 2021 13:01:46 +0000 [thread overview]
Message-ID: <20211124130150.268230-15-berrange@redhat.com> (raw)
In-Reply-To: <20211124130150.268230-1-berrange@redhat.com>
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.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
.gitlab-ci.d/cirrus/freebsd-12.vars | 11 +++++++----
.gitlab-ci.d/cirrus/freebsd-13.vars | 11 +++++++----
.gitlab-ci.d/cirrus/macos-11.vars | 11 ++++++-----
tests/lcitool/refresh | 10 ++++++++++
4 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars
index 2099b21354..9c52266811 100644
--- a/.gitlab-ci.d/cirrus/freebsd-12.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-12.vars
@@ -2,12 +2,15 @@
#
# $ lcitool variables freebsd-12 qemu
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1
+# https://gitlab.com/libvirt/libvirt-ci
-PACKAGING_COMMAND='pkg'
CCACHE='/usr/local/bin/ccache'
+CPAN_PKGS=''
+CROSS_PKGS=''
MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
-PYTHON='/usr/local/bin/python3'
+PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
-PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PYPI_PKGS=''
+PYTHON='/usr/local/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars
index 323fe806d5..7b44dba324 100644
--- a/.gitlab-ci.d/cirrus/freebsd-13.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-13.vars
@@ -2,12 +2,15 @@
#
# $ lcitool variables freebsd-13 qemu
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1
+# https://gitlab.com/libvirt/libvirt-ci
-PACKAGING_COMMAND='pkg'
CCACHE='/usr/local/bin/ccache'
+CPAN_PKGS=''
+CROSS_PKGS=''
MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
-PYTHON='/usr/local/bin/python3'
+PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
-PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PYPI_PKGS=''
+PYTHON='/usr/local/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-11.vars
index cbec8a44a3..613d1373c2 100644
--- a/.gitlab-ci.d/cirrus/macos-11.vars
+++ b/.gitlab-ci.d/cirrus/macos-11.vars
@@ -2,14 +2,15 @@
#
# $ lcitool variables macos-11 qemu
#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1
+# https://gitlab.com/libvirt/libvirt-ci
-PACKAGING_COMMAND='brew'
CCACHE='/usr/local/bin/ccache'
+CPAN_PKGS='Test::Harness'
+CROSS_PKGS=''
MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
-PYTHON='/usr/local/bin/python3'
+PACKAGING_COMMAND='brew'
PIP3='/usr/local/bin/pip3'
-PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd'
+PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd'
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv'
-CPAN_PKGS='Test::Harness'
+PYTHON='/usr/local/bin/python3'
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)
--
2.33.1
next prev parent reply other threads:[~2021-11-24 13:17 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 13:01 [PATCH v4 00/18] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2021-11-24 13:01 ` [PATCH v4 01/18] ui: avoid compiler warnings from unused clipboard info variable Daniel P. Berrangé
2021-11-24 13:33 ` Philippe Mathieu-Daudé
2021-12-15 10:22 ` Philippe Mathieu-Daudé
2021-11-24 13:01 ` [PATCH v4 02/18] spice: Update QXLInterface for spice >= 0.15.0 Daniel P. Berrangé
2021-11-24 13:34 ` Philippe Mathieu-Daudé
2021-11-24 13:01 ` [PATCH v4 03/18] meson: require liburing >= 0.3 Daniel P. Berrangé
2021-12-15 11:27 ` Philippe Mathieu-Daudé
2021-12-15 11:56 ` Philippe Mathieu-Daudé
2021-12-15 13:25 ` Stefan Hajnoczi
2021-12-15 13:47 ` Stefano Garzarella
2021-12-15 16:21 ` Li Zhang
2021-11-24 13:01 ` [PATCH v4 04/18] ui: avoid warnings about directdb on Alpine / musl libc Daniel P. Berrangé
2021-11-24 13:32 ` Thomas Huth
2021-11-24 13:42 ` Daniel P. Berrangé
2021-12-15 11:59 ` Philippe Mathieu-Daudé
2021-11-24 13:01 ` [PATCH v4 05/18] ci: explicitly skip I/O tests on alpine Daniel P. Berrangé
2021-11-24 13:36 ` Thomas Huth
2021-11-24 13:38 ` Philippe Mathieu-Daudé
2021-11-24 13:46 ` Daniel P. Berrangé
2021-12-15 12:02 ` Philippe Mathieu-Daudé
2021-11-24 13:01 ` [PATCH v4 06/18] tests/docker: switch fedora image to release 35 Daniel P. Berrangé
2021-12-15 11:28 ` Philippe Mathieu-Daudé
2021-11-24 13:01 ` [PATCH v4 07/18] tests: integrate lcitool for generating build env manifests Daniel P. Berrangé
2021-12-15 11:45 ` Philippe Mathieu-Daudé
2021-11-24 13:01 ` [PATCH v4 08/18] tests/docker: auto-generate centos8.docker with lcitool Daniel P. Berrangé
2021-11-24 13:01 ` [PATCH v4 09/18] tests/docker: auto-generate fedora.docker " Daniel P. Berrangé
2021-11-24 13:01 ` [PATCH v4 10/18] tests/docker: auto-generate ubuntu1804.docker " Daniel P. Berrangé
2021-11-24 13:01 ` [PATCH v4 11/18] tests/docker: auto-generate ubuntu2004.docker " Daniel P. Berrangé
2021-11-24 13:01 ` [PATCH v4 12/18] tests/docker: auto-generate opensuse-leap.docker " Daniel P. Berrangé
2021-11-24 13:01 ` [PATCH v4 13/18] tests/docker: remove ubuntu.docker container Daniel P. Berrangé
2021-11-24 13:01 ` Daniel P. Berrangé [this message]
2021-12-15 11:36 ` [PATCH v4 14/18] .gitlab-ci.d/cirrus: auto-generate variables with lcitool Philippe Mathieu-Daudé
2021-11-24 13:01 ` [PATCH v4 15/18] tests/docker: updates to alpine package list Daniel P. Berrangé
2021-12-15 11:31 ` Philippe Mathieu-Daudé
2021-12-15 11:43 ` Daniel P. Berrangé
2021-12-15 11:47 ` Philippe Mathieu-Daudé
2021-11-24 13:01 ` [PATCH v4 16/18] tests/docker: fix sorting of alpine image package lists Daniel P. Berrangé
2021-11-24 13:39 ` Philippe Mathieu-Daudé
2021-11-24 13:01 ` [PATCH v4 17/18] tests/docker: fully expand the alpine package list Daniel P. Berrangé
2021-12-15 11:32 ` Philippe Mathieu-Daudé
2021-11-24 13:01 ` [PATCH v4 18/18] tests/docker: auto-generate alpine.docker with lcitool Daniel P. Berrangé
2021-11-24 13:42 ` Philippe Mathieu-Daudé
2021-12-15 12:57 ` [PATCH v4 00/18] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211124130150.268230-15-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).