Re: [PATCH 3/3] .gitlab-ci.d/cirrus: Add manual testing of macOS 15 (Sequoia)

[Thomas Huth <thuth@redhat.com>]

On 17/09/2024 14.52, Daniel P. Berrangé wrote:
> On Tue, Sep 17, 2024 at 10:50:58AM +0200, Philippe Mathieu-Daudé wrote:
>> Upgrade libvirt-ci so it covers macOS 15. Add a manual entry
>> (QEMU_JOB_OPTIONAL: 1) to test on Sequoia release. Refresh the
>> lci-tool generated files.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>> Pending libvirt-ci MR 501: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/501
>>
>> CI job: https://gitlab.com/philmd/qemu/-/jobs/7841560032
>> ---
>>   .gitlab-ci.d/cirrus.yml           | 17 +++++++++++++++++
>>   .gitlab-ci.d/cirrus/macos-15.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-15.vars
>>
>> diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
>> index f061687f1b..b84b42cce5 100644
>> --- a/.gitlab-ci.d/cirrus.yml
>> +++ b/.gitlab-ci.d/cirrus.yml
>> @@ -66,6 +66,22 @@ aarch64-macos-14-base-build:
>>       NAME: macos-14
>>       CIRRUS_VM_INSTANCE_TYPE: macos_instance
>>       CIRRUS_VM_IMAGE_SELECTOR: image
>> +    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest
> 
> Something isn't right here - the existing 14 release is "sonoma", "ventura"
> was 13 IIUC which you just removed
> 
>> +    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
>> +    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-sonoma-base:latest
> 
> And this should be sequoia
> 
> I think the info we've committed to libvirt-ci is probably wrong.

FYI, I'm going to queue this patch with the update to the fixed libvirt-ci 
commit and this patch on top:

diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -66,7 +66,7 @@ aarch64-macos-14-base-build:
      NAME: macos-14
      CIRRUS_VM_INSTANCE_TYPE: macos_instance
      CIRRUS_VM_IMAGE_SELECTOR: image
-    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest
+    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest
      CIRRUS_VM_CPUS: 12
      CIRRUS_VM_RAM: 24G
      UPDATE_COMMAND: brew update
@@ -82,7 +82,7 @@ aarch64-macos-15-base-build:
      NAME: macos-15
      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-sequoia-base:latest
      CIRRUS_VM_CPUS: 12
      CIRRUS_VM_RAM: 24G
      UPDATE_COMMAND: brew update

  Thomas