[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 14/18] .gitlab-ci.d/cirrus: auto-generate variables with lcito
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v4 14/18] .gitlab-ci.d/cirrus: auto-generate variables with lcitool |
Date: |
Wed, 24 Nov 2021 13:01:46 +0000 |
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
- Re: [PATCH v4 05/18] ci: explicitly skip I/O tests on alpine, (continued)
- [PATCH v4 06/18] tests/docker: switch fedora image to release 35, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 07/18] tests: integrate lcitool for generating build env manifests, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 08/18] tests/docker: auto-generate centos8.docker with lcitool, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 10/18] tests/docker: auto-generate ubuntu1804.docker with lcitool, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 09/18] tests/docker: auto-generate fedora.docker with lcitool, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 11/18] tests/docker: auto-generate ubuntu2004.docker with lcitool, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 13/18] tests/docker: remove ubuntu.docker container, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 14/18] .gitlab-ci.d/cirrus: auto-generate variables with lcitool,
Daniel P . Berrangé <=
- [PATCH v4 16/18] tests/docker: fix sorting of alpine image package lists, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 12/18] tests/docker: auto-generate opensuse-leap.docker with lcitool, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 15/18] tests/docker: updates to alpine package list, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 17/18] tests/docker: fully expand the alpine package list, Daniel P . Berrangé, 2021/11/24
- [PATCH v4 18/18] tests/docker: auto-generate alpine.docker with lcitool, Daniel P . Berrangé, 2021/11/24