[PATCH] .gitlab-ci.d/cirrus: Remove the macos-15 job

[PATCH] .gitlab-ci.d/cirrus: Remove the macos-15 job

[Thomas Huth]

Cirrus-CI stopped providing the possibility to run macOS 15 jobs.
Quoting https://cirrus-ci.org/guide/macOS/ :

 "Cirrus CI Cloud only allows ghcr.io/cirruslabs/macos-runner:sonoma image ..."

If you still try to run a Sequoia image, it gets automatically "upgraded"
to Sonoma instead. So the macos-15 job in the QEMU CI now does not
make sense anymore, thus let's remove it.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .gitlab-ci.d/cirrus.yml           | 20 ++------------------
 .gitlab-ci.d/cirrus/macos-15.vars | 16 ----------------
 tests/lcitool/refresh             |  1 -
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 .gitlab-ci.d/cirrus/macos-15.vars

diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
index 5708c2bbab..6a7bafac7b 100644
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -60,13 +60,13 @@ x64-freebsd-14-build:
     CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblaze-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,xtensa-softmmu
     TEST_TARGETS: check
 
-aarch64-macos-14-base-build:
+aarch64-macos-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_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma
     CIRRUS_VM_CPUS: 12
     CIRRUS_VM_RAM: 24G
     UPDATE_COMMAND: brew update
@@ -75,19 +75,3 @@ aarch64-macos-14-base-build:
     PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig
     CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblazeel-softmmu,mips64-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4-softmmu,xtensaeb-softmmu
     TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64
-
-aarch64-macos-15-base-build:
-  extends: .cirrus_build_job
-  variables:
-    NAME: macos-15
-    CIRRUS_VM_INSTANCE_TYPE: macos_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image
-    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sequoia-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
diff --git a/.gitlab-ci.d/cirrus/macos-15.vars b/.gitlab-ci.d/cirrus/macos-15.vars
deleted file mode 100644
index 23b2c1d22f..0000000000
--- a/.gitlab-ci.d/cirrus/macos-15.vars
+++ /dev/null
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool variables macos-15 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 gtk-vnc 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/refresh b/tests/lcitool/refresh
index 0f16f4d525..7cf882cda7 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -229,7 +229,6 @@ try:
     #
     generate_cirrus("freebsd-14")
     generate_cirrus("macos-14")
-    generate_cirrus("macos-15")
 
     #
     # VM packages lists
-- 
2.47.0

Re: [PATCH] .gitlab-ci.d/cirrus: Remove the macos-15 job

[Daniel P. Berrangé]

On Mon, Oct 21, 2024 at 02:47:22PM +0200, Thomas Huth wrote:
> Cirrus-CI stopped providing the possibility to run macOS 15 jobs.
> Quoting https://cirrus-ci.org/guide/macOS/ :
> 
>  "Cirrus CI Cloud only allows ghcr.io/cirruslabs/macos-runner:sonoma image ..."
> 
> If you still try to run a Sequoia image, it gets automatically "upgraded"
> to Sonoma instead. So the macos-15 job in the QEMU CI now does not
> make sense anymore, thus let's remove it.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  .gitlab-ci.d/cirrus.yml           | 20 ++------------------
>  .gitlab-ci.d/cirrus/macos-15.vars | 16 ----------------
>  tests/lcitool/refresh             |  1 -
>  3 files changed, 2 insertions(+), 35 deletions(-)
>  delete mode 100644 .gitlab-ci.d/cirrus/macos-15.vars

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH] .gitlab-ci.d/cirrus: Remove the macos-15 job

[Philippe Mathieu-Daudé]

On 21/10/24 09:47, Thomas Huth wrote:
> Cirrus-CI stopped providing the possibility to run macOS 15 jobs.
> Quoting https://cirrus-ci.org/guide/macOS/ :
> 
>   "Cirrus CI Cloud only allows ghcr.io/cirruslabs/macos-runner:sonoma image ..."

Odd, Sequoia is still available:

https://github.com/cirruslabs/macos-image-templates

   The following image variants are currently available:

   macos-{sequoia,sonoma}-base image has only brew pre-installed
   and the latest version of macOS available

and is still published:

https://github.com/cirruslabs/macos-image-templates/pkgs/container/macos-sequoia-vanilla

Ah now I see before [1] we had:

   Cirrus CI Cloud only allows images managed and regularly updated
   by us [2] where with Cirrus CLI you can run any Tart VM on your
   infrastructure.

[1] 
https://web.archive.org/web/20240122002234/https://cirrus-ci.org/guide/macOS/
[2] https://github.com/orgs/cirruslabs/packages

Acked-by: Philippe Mathieu-Daudé <philmd@linaro.org>

> If you still try to run a Sequoia image, it gets automatically "upgraded"
> to Sonoma instead. So the macos-15 job in the QEMU CI now does not
> make sense anymore, thus let's remove it.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   .gitlab-ci.d/cirrus.yml           | 20 ++------------------
>   .gitlab-ci.d/cirrus/macos-15.vars | 16 ----------------
>   tests/lcitool/refresh             |  1 -
>   3 files changed, 2 insertions(+), 35 deletions(-)
>   delete mode 100644 .gitlab-ci.d/cirrus/macos-15.vars