[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH stable-7.2 07/23] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventu
From: |
Thomas Huth |
Subject: |
[PATCH stable-7.2 07/23] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura) |
Date: |
Tue, 3 Dec 2024 11:53:30 +0100 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
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>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20231108162022.76189-1-philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231120150833.2552739-3-alex.bennee@linaro.org>
(cherry picked from commit 7528ef7321951a89844693947bac8b237275072e)
---
.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 3c4964cf33..31882ab813 100644
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -58,13 +58,13 @@ x64-freebsd-13-build:
CONFIGURE_ARGS:
--target-list-exclude=arm-softmmu,i386-softmmu,microblaze-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4eb-softmmu,xtensa-softmmu
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 da6aa6469b..ae1ee45605 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 f4c3fe09e5..278ba9f4da 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -170,7 +170,7 @@ try:
# Cirrus packages lists for GitLab
#
generate_cirrus("freebsd-13")
- generate_cirrus("macos-12")
+ generate_cirrus("macos-13")
sys.exit(0)
except Exception as ex:
--
2.47.0
- [PATCH stable-7.2 00/23] Fixes for the CI in the 7.2 stable branch, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 02/23] Upgrade all packages in the FreeBSD VMs to ensure the freshness, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 03/23] lcitool: drop perl from QEMU project/dependencies, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 01/23] FreeBSD: Upgrade to 12.4 release, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 04/23] lcitool: drop texinfo from QEMU project/dependencies, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 05/23] tests: add socat dependency for tests, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 06/23] .gitlab-ci.d/cirrus: Drop the CI job for compiling with FreeBSD 12, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 08/23] lcitool: update submodule, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 09/23] .gitlab-ci.d/cirrus: Add manual testing of macOS 14 (Sonoma), Thomas Huth, 2024/12/03
- [PATCH stable-7.2 07/23] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura),
Thomas Huth <=
- [PATCH stable-7.2 10/23] tests/vm/freebsd: Update to FreeBSD 13.2, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 11/23] tests/vm/freebsd: Add additional library paths for libfdt, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 12/23] Update FreeBSD CI jobs FreeBSD 14.1, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 16/23] gitlab: switch from 'stable' to 'latest' docker container tags, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 13/23] ci: install meson in CirrusCI KVM build environment, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 18/23] tests: update most Debian images to Bookworm, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 21/23] tests: update lcitool to fix freebsd py311-yaml rename, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 20/23] testing: bump mips64el cross to bookworm and fix package list, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 17/23] tests/lcitool: add an explicit gcc-native package, Thomas Huth, 2024/12/03
- [PATCH stable-7.2 14/23] .gitlab-ci.d/cirrus: Remove the netbsd and openbsd jobs, Thomas Huth, 2024/12/03