| Message ID | 20221116175023.80627-1-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | ci: replace x86_64 macos-11 with aarch64 macos-12 | expand |
On 16/11/2022 18.50, Daniel P. Berrangé wrote: > The Cirrus CI service has announced the intent to discontinue > support for x86_64 macOS CI runners. They already have aarch64 > runners available and require all projects to switch to these > images before Jan 1st 2023. The different architecture is > merely determined by the image name requested. > > For aarch64 they only support macOS 12 onwards. At the same > time our support policy only guarantees the most recent 2 > major versions, so macOS 12 is already technically our min > version. > > https://cirrus-ci.org/blog/2022/11/08/sunsetting-intel-macos-instances/ > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > .gitlab-ci.d/cirrus.yml | 12 ++++++------ > .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} | 12 ++++++------ > tests/lcitool/libvirt-ci | 2 +- > tests/lcitool/refresh | 2 +- > 4 files changed, 14 insertions(+), 14 deletions(-) > rename .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} (74%) Works for me: https://gitlab.com/thuth/qemu/-/jobs/3336969845 Tested-by: Thomas Huth <thuth@redhat.com> I can pick this up for my next pull request.
On 16/11/22 18:50, Daniel P. Berrangé wrote: > The Cirrus CI service has announced the intent to discontinue > support for x86_64 macOS CI runners. They already have aarch64 > runners available and require all projects to switch to these > images before Jan 1st 2023. The different architecture is > merely determined by the image name requested. > > For aarch64 they only support macOS 12 onwards. At the same > time our support policy only guarantees the most recent 2 > major versions, so macOS 12 is already technically our min > version. > > https://cirrus-ci.org/blog/2022/11/08/sunsetting-intel-macos-instances/ > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > .gitlab-ci.d/cirrus.yml | 12 ++++++------ > .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} | 12 ++++++------ > tests/lcitool/libvirt-ci | 2 +- > tests/lcitool/refresh | 2 +- > 4 files changed, 14 insertions(+), 14 deletions(-) > rename .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} (74%) Thanks! Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Thomas Huth <thuth@redhat.com> writes: > On 16/11/2022 18.50, Daniel P. Berrangé wrote: >> The Cirrus CI service has announced the intent to discontinue >> support for x86_64 macOS CI runners. They already have aarch64 >> runners available and require all projects to switch to these >> images before Jan 1st 2023. The different architecture is >> merely determined by the image name requested. >> For aarch64 they only support macOS 12 onwards. At the same >> time our support policy only guarantees the most recent 2 >> major versions, so macOS 12 is already technically our min >> version. >> https://cirrus-ci.org/blog/2022/11/08/sunsetting-intel-macos-instances/ >> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> >> --- >> .gitlab-ci.d/cirrus.yml | 12 ++++++------ >> .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} | 12 ++++++------ >> tests/lcitool/libvirt-ci | 2 +- >> tests/lcitool/refresh | 2 +- >> 4 files changed, 14 insertions(+), 14 deletions(-) >> rename .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} (74%) > > Works for me: > > https://gitlab.com/thuth/qemu/-/jobs/3336969845 > > Tested-by: Thomas Huth <thuth@redhat.com> > > I can pick this up for my next pull request. I'm rolling a series now so I've queued to for-7.2/misc-fixes, thanks.
diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index d70da61248..634a73a742 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -70,19 +70,19 @@ x64-freebsd-13-build: INSTALL_COMMAND: pkg install -y TEST_TARGETS: check -x64-macos-11-base-build: +aarch64-macos-12-base-build: extends: .cirrus_build_job variables: - NAME: macos-11 - CIRRUS_VM_INSTANCE_TYPE: osx_instance + NAME: macos-12 + CIRRUS_VM_INSTANCE_TYPE: macos_instance CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: big-sur-base + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest CIRRUS_VM_CPUS: 12 CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update INSTALL_COMMAND: brew install - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + 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 diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-12.vars similarity index 74% rename from .gitlab-ci.d/cirrus/macos-11.vars rename to .gitlab-ci.d/cirrus/macos-12.vars index aee9f50de6..ef9e14b373 100644 --- a/.gitlab-ci.d/cirrus/macos-11.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -1,16 +1,16 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables macos-11 qemu +# $ lcitool variables macos-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -CCACHE='/usr/local/bin/ccache' +CCACHE='/opt/homebrew/bin/ccache' CPAN_PKGS='' CROSS_PKGS='' -MAKE='/usr/local/bin/gmake' -NINJA='/usr/local/bin/ninja' +MAKE='/opt/homebrew/bin/gmake' +NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' -PIP3='/usr/local/bin/pip3' +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 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' -PYTHON='/usr/local/bin/python3' +PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index d40e203631..e3eb28cf2e 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit d40e203631eb3eacee17e8cf8fd20aa5152db62a +Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index ce0b24c0b1..fa966e4009 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -176,7 +176,7 @@ try: # generate_cirrus("freebsd-12") generate_cirrus("freebsd-13") - generate_cirrus("macos-11") + generate_cirrus("macos-12") sys.exit(0) except Exception as ex:
The Cirrus CI service has announced the intent to discontinue support for x86_64 macOS CI runners. They already have aarch64 runners available and require all projects to switch to these images before Jan 1st 2023. The different architecture is merely determined by the image name requested. For aarch64 they only support macOS 12 onwards. At the same time our support policy only guarantees the most recent 2 major versions, so macOS 12 is already technically our min version. https://cirrus-ci.org/blog/2022/11/08/sunsetting-intel-macos-instances/ Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- .gitlab-ci.d/cirrus.yml | 12 ++++++------ .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} | 12 ++++++------ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) rename .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} (74%)