Il mer 8 nov 2023, 19:33 Philippe Mathieu-Daudé <phi...@linaro.org> ha scritto:
> Upgrade libvirt-ci so it covers macOS 14. Add a manual entry > (QEMU_JOB_OPTIONAL: 1) to test on Sonoma release. Refresh the > lci-tool generated files. > > Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> > --- > Docs are disabled due to: > > Collecting sphinx > Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB) > Collecting sphinx-rtd-theme > Downloading sphinx_rtd_theme-1.3.0-py2.py3-none-any.whl.metadata (4.5 > kB) > Same issue: the pip that is installing sphinx is unrelated to the Python that is used to compile QEMU. Use /opt/homebrew/bin/pip3 instead. Paolo ... > Installing collected packages ... > ... > python determined to be '/opt/homebrew/bin/python3' > python version: Python 3.11.6 > mkvenv: Creating non-isolated virtual environment at 'pyvenv' > mkvenv: checking for sphinx>=1.6 > mkvenv: checking for sphinx_rtd_theme>=0.5 > ... > Program /opt/homebrew/opt/python@3.12/bin/sphinx-build found: NO > ../docs/meson.build:1:15: ERROR: Program > '/opt/homebrew/opt/python@3.12/bin/sphinx-build' > not found or not executable > > ¯\_(ツ)_/¯ > --- > .gitlab-ci.d/cirrus.yml | 17 +++++++++++++++++ > .gitlab-ci.d/cirrus/macos-14.vars | 16 ++++++++++++++++ > tests/lcitool/libvirt-ci | 2 +- > tests/lcitool/refresh | 1 + > 4 files changed, 35 insertions(+), 1 deletion(-) > create mode 100644 .gitlab-ci.d/cirrus/macos-14.vars > > diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml > index 07dc6edae1..84ce143509 100644 > --- a/.gitlab-ci.d/cirrus.yml > +++ b/.gitlab-ci.d/cirrus.yml > @@ -74,6 +74,23 @@ aarch64-macos-13-base-build: > PKG_CONFIG_PATH: > /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig > TEST_TARGETS: check-unit check-block check-qapi-schema > check-softfloat check-qtest-x86_64 > > +aarch64-macos-14-base-build: > + extends: .cirrus_build_job > + variables: > + NAME: macos-14 > + CIRRUS_VM_INSTANCE_TYPE: macos_instance > + CIRRUS_VM_IMAGE_SELECTOR: image > + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest > + CIRRUS_VM_CPUS: 12 > + CIRRUS_VM_RAM: 24G > + UPDATE_COMMAND: brew update > + INSTALL_COMMAND: brew install > + PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin > + PKG_CONFIG_PATH: > /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig > + TEST_TARGETS: check-unit check-block check-qapi-schema > check-softfloat check-qtest-x86_64 > + QEMU_JOB_OPTIONAL: 1 > + CONFIGURE_ARGS: --disable-docs > + > > # The following jobs run VM-based tests via KVM on a Linux-based > Cirrus-CI job > .cirrus_kvm_job: > diff --git a/.gitlab-ci.d/cirrus/macos-14.vars > b/.gitlab-ci.d/cirrus/macos-14.vars > new file mode 100644 > index 0000000000..43070f4a26 > --- /dev/null > +++ b/.gitlab-ci.d/cirrus/macos-14.vars > @@ -0,0 +1,16 @@ > +# THIS FILE WAS AUTO-GENERATED > +# > +# $ lcitool variables macos-14 qemu > +# > +# https://gitlab.com/libvirt/libvirt-ci > + > +CCACHE='/opt/homebrew/bin/ccache' > +CPAN_PKGS='' > +CROSS_PKGS='' > +MAKE='/opt/homebrew/bin/gmake' > +NINJA='/opt/homebrew/bin/ninja' > +PACKAGING_COMMAND='brew' > +PIP3='/opt/homebrew/bin/pip3' > +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus > diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc > jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp > libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja > pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse > spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' > +PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' > +PYTHON='/opt/homebrew/bin/python3' > diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci > index 36bc517161..77c800186f 160000 > --- a/tests/lcitool/libvirt-ci > +++ b/tests/lcitool/libvirt-ci > @@ -1 +1 @@ > -Subproject commit 36bc517161c45ead20224d47f2dc4fa428af6724 > +Subproject commit 77c800186f34b21be7660750577cc5582a914deb > diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh > index 2259f131b4..e11d0ba381 100755 > --- a/tests/lcitool/refresh > +++ b/tests/lcitool/refresh > @@ -197,6 +197,7 @@ try: > # > generate_cirrus("freebsd-13") > generate_cirrus("macos-13") > + generate_cirrus("macos-14") > > # > # VM packages lists > -- > 2.41.0 > >
