| Message ID | 20240917085058.1740-4-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ci: Replace macOS coverage from release 13 to 15 | expand |
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. With regards, Daniel
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
On Mon, Oct 07, 2024 at 11:10:20AM +0200, Thomas Huth wrote: > 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 Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
On 7/10/24 06:17, Daniel P. Berrangé wrote: > On Mon, Oct 07, 2024 at 11:10:20AM +0200, Thomas Huth wrote: >> 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: Thank you Daniel / Thomas! >> >> 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 > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > > With regards, > Daniel
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 + 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 CIRRUS_VM_CPUS: 12 CIRRUS_VM_RAM: 24G @@ -74,3 +90,4 @@ aarch64-macos-14-base-build: 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 new file mode 100644 index 0000000000..23b2c1d22f --- /dev/null +++ b/.gitlab-ci.d/cirrus/macos-15.vars @@ -0,0 +1,16 @@ +# 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/libvirt-ci b/tests/lcitool/libvirt-ci index 789b4601bc..488392b0a8 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 789b4601bce4e01f43fdb6ad4ce5ab4e46674440 +Subproject commit 488392b0a8f4ea91599f3e5b282bcba243f9ae80 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index d111b01480..06d27f9cf2 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -203,6 +203,7 @@ try: # generate_cirrus("freebsd-14") generate_cirrus("macos-14") + generate_cirrus("macos-15") # # VM packages lists
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