[PATCH] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura)

[PATCH] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura)

[Philippe Mathieu-Daudé]

macOS 14 "Sonoma" was released on September 2023 [1].

According to QEMU's support policy, we stop supporting the
previous major release two years after the the new major
release has been published. Replace the macOS 12 (Monterey)
testing by macOS 13 (Ventura, released on October 2022, [2]).

Refresh the generated files by running:

  $ make lcitool-refresh

[1] https://www.apple.com/newsroom/2023/09/macos-sonoma-is-available-today/
[2] https://www.apple.com/newsroom/2022/10/macos-ventura-is-now-available/

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 .gitlab-ci.d/cirrus.yml                              | 6 +++---
 .gitlab-ci.d/cirrus/{macos-12.vars => macos-13.vars} | 2 +-
 tests/lcitool/refresh                                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename .gitlab-ci.d/cirrus/{macos-12.vars => macos-13.vars} (95%)

diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
index e7f1f83c2c..07dc6edae1 100644
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -59,13 +59,13 @@ x64-freebsd-13-build:
     INSTALL_COMMAND: pkg install -y
     TEST_TARGETS: check
 
-aarch64-macos-12-base-build:
+aarch64-macos-13-base-build:
   extends: .cirrus_build_job
   variables:
-    NAME: macos-12
+    NAME: macos-13
     CIRRUS_VM_INSTANCE_TYPE: macos_instance
     CIRRUS_VM_IMAGE_SELECTOR: image
-    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest
+    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest
     CIRRUS_VM_CPUS: 12
     CIRRUS_VM_RAM: 24G
     UPDATE_COMMAND: brew update
diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-13.vars
similarity index 95%
rename from .gitlab-ci.d/cirrus/macos-12.vars
rename to .gitlab-ci.d/cirrus/macos-13.vars
index 5f3fb346d1..534f029956 100644
--- a/.gitlab-ci.d/cirrus/macos-12.vars
+++ b/.gitlab-ci.d/cirrus/macos-13.vars
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool variables macos-12 qemu
+#  $ lcitool variables macos-13 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 92e7d30982..2259f131b4 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -196,7 +196,7 @@ try:
     # Cirrus packages lists for GitLab
     #
     generate_cirrus("freebsd-13")
-    generate_cirrus("macos-12")
+    generate_cirrus("macos-13")
 
     #
     # VM packages lists
-- 
2.41.0

Re: [PATCH] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura)

[Daniel P. Berrangé]

On Wed, Nov 08, 2023 at 05:20:22PM +0100, Philippe Mathieu-Daudé wrote:
> macOS 14 "Sonoma" was released on September 2023 [1].
> 
> According to QEMU's support policy, we stop supporting the
> previous major release two years after the the new major
> release has been published. Replace the macOS 12 (Monterey)
> testing by macOS 13 (Ventura, released on October 2022, [2]).
> 
> Refresh the generated files by running:
> 
>   $ make lcitool-refresh
> 
> [1] https://www.apple.com/newsroom/2023/09/macos-sonoma-is-available-today/
> [2] https://www.apple.com/newsroom/2022/10/macos-ventura-is-now-available/
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  .gitlab-ci.d/cirrus.yml                              | 6 +++---
>  .gitlab-ci.d/cirrus/{macos-12.vars => macos-13.vars} | 2 +-
>  tests/lcitool/refresh                                | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
>  rename .gitlab-ci.d/cirrus/{macos-12.vars => macos-13.vars} (95%)

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: Upgrade macOS to 13 (Ventura)

[Alex Bennée]

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

> macOS 14 "Sonoma" was released on September 2023 [1].
>
> According to QEMU's support policy, we stop supporting the
> previous major release two years after the the new major
> release has been published. Replace the macOS 12 (Monterey)
> testing by macOS 13 (Ventura, released on October 2022, [2]).
>
> Refresh the generated files by running:

Queued to for-8.2/random-fixes, thanks.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura)

[Paolo Bonzini]

Queued, thanks.

Paolo