1. Patchew
  2. Libvirt
  3. View series

[PATCH] ci: Switch from macOS 13 to macOS 15

Michal Privoznik posted 1 patch 2 weeks, 4 days ago 
ci/cirrus/{macos-13.vars => macos-15.vars} |  0
ci/gitlab/builds.yml                       | 32 +++++++++++-----------
ci/manifest.yml                            | 14 +++++-----
3 files changed, 23 insertions(+), 23 deletions(-)
rename ci/cirrus/{macos-13.vars => macos-15.vars} (100%)
[PATCH] ci: Switch from macOS 13 to macOS 15
Posted by Michal Privoznik 2 weeks, 4 days ago 
libvirt-ci added macOS 15 so let's introduce it and while at it
drop macOS 13.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 ci/cirrus/{macos-13.vars => macos-15.vars} |  0
 ci/gitlab/builds.yml                       | 32 +++++++++++-----------
 ci/manifest.yml                            | 14 +++++-----
 3 files changed, 23 insertions(+), 23 deletions(-)
 rename ci/cirrus/{macos-13.vars => macos-15.vars} (100%)

diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-15.vars
similarity index 100%
rename from ci/cirrus/macos-13.vars
rename to ci/cirrus/macos-15.vars
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 214119b902..6f78ba2e89 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -624,22 +624,6 @@ x86_64-freebsd-14:
     UPGRADE_COMMAND: pkg upgrade -y
 
 
-aarch64-macos-13:
-  extends: .cirrus_build_job
-  needs: []
-  allow_failure: false
-  variables:
-    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest
-    CIRRUS_VM_IMAGE_SELECTOR: image
-    CIRRUS_VM_INSTANCE_TYPE: macos_instance
-    INSTALL_COMMAND: brew install
-    NAME: macos-13
-    PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
-    PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-    UPDATE_COMMAND: brew update
-    UPGRADE_COMMAND: brew upgrade
-
-
 aarch64-macos-14:
   extends: .cirrus_build_job
   needs: []
@@ -654,3 +638,19 @@ aarch64-macos-14:
     PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
     UPDATE_COMMAND: brew update
     UPGRADE_COMMAND: brew upgrade
+
+
+aarch64-macos-15:
+  extends: .cirrus_build_job
+  needs: []
+  allow_failure: false
+  variables:
+    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest
+    CIRRUS_VM_IMAGE_SELECTOR: image
+    CIRRUS_VM_INSTANCE_TYPE: macos_instance
+    INSTALL_COMMAND: brew install
+    NAME: macos-15
+    PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
+    PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+    UPDATE_COMMAND: brew update
+    UPGRADE_COMMAND: brew upgrade
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 647510ed2f..3c2366380c 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -203,13 +203,6 @@ targets:
         variables:
           RPM: skip
 
-  macos-13:
-    jobs:
-      - arch: aarch64
-        variables:
-          PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
-          PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-
   macos-14:
     jobs:
       - arch: aarch64
@@ -217,6 +210,13 @@ targets:
           PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
           PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
 
+  macos-15:
+    jobs:
+      - arch: aarch64
+        variables:
+          PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
+          PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+
   ubuntu-2204:
     jobs:
       - arch: x86_64
-- 
2.44.2
Re: [PATCH] ci: Switch from macOS 13 to macOS 15
Posted by Andrea Bolognani 2 weeks, 3 days ago 
On Tue, Sep 17, 2024 at 03:26:02PM GMT, Michal Privoznik wrote:
> +aarch64-macos-15:
> +  extends: .cirrus_build_job
> +  needs: []
> +  allow_failure: false
> +  variables:
> +    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest

This is using the Sonoma (macOS 14) image, which is clearly wrong.

The libvirt-ci patches were incorrect, and AFAICT Cirrus CI simply
hasn't introduced support for macOS 15 yet, which isn't unexpected
since the OS was released mere days ago. So

  NACK

to this change, and I'm going to look into reverting the libvirt-ci
one too.

-- 
Andrea Bolognani / Red Hat / Virtualization
Re: [PATCH] ci: Switch from macOS 13 to macOS 15
Posted by Daniel P. Berrangé 2 weeks, 3 days ago 
On Wed, Sep 18, 2024 at 04:32:25AM -0500, Andrea Bolognani wrote:
> On Tue, Sep 17, 2024 at 03:26:02PM GMT, Michal Privoznik wrote:
> > +aarch64-macos-15:
> > +  extends: .cirrus_build_job
> > +  needs: []
> > +  allow_failure: false
> > +  variables:
> > +    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest
> 
> This is using the Sonoma (macOS 14) image, which is clearly wrong.
> 
> The libvirt-ci patches were incorrect, and AFAICT Cirrus CI simply
> hasn't introduced support for macOS 15 yet, which isn't unexpected
> since the OS was released mere days ago. So

Their docs say only sonoma, but their underlying git repo does in
fact show sequoia. They're currently exposing Beta images, which
is probably why they don't document it yet. Assuming the CI job
passes, I see no reason we can't use the sequoia images today though,
as they'll get updated to non-beta versions soon enough

https://github.com/cirruslabs/macos-image-templates


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] ci: Switch from macOS 13 to macOS 15
Posted by Andrea Bolognani 2 weeks, 3 days ago 
On Wed, Sep 18, 2024 at 02:33:10PM GMT, Daniel P. Berrangé wrote:
> On Wed, Sep 18, 2024 at 04:32:25AM -0500, Andrea Bolognani wrote:
> > On Tue, Sep 17, 2024 at 03:26:02PM GMT, Michal Privoznik wrote:
> > > +aarch64-macos-15:
> > > +  extends: .cirrus_build_job
> > > +  needs: []
> > > +  allow_failure: false
> > > +  variables:
> > > +    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest
> >
> > This is using the Sonoma (macOS 14) image, which is clearly wrong.
> >
> > The libvirt-ci patches were incorrect, and AFAICT Cirrus CI simply
> > hasn't introduced support for macOS 15 yet, which isn't unexpected
> > since the OS was released mere days ago. So
>
> Their docs say only sonoma, but their underlying git repo does in
> fact show sequoia. They're currently exposing Beta images, which
> is probably why they don't document it yet. Assuming the CI job
> passes, I see no reason we can't use the sequoia images today though,
> as they'll get updated to non-beta versions soon enough
>
> https://github.com/cirruslabs/macos-image-templates

I'd wait for them to be made GA.

New macOS releases have historically introduced changes that require
libvirt to adapt, sometimes with significant effort, and I wouldn't
want anyone to spend time investigating a build failure that can
potentially affect the Beta version of the OS but not the GA one.

-- 
Andrea Bolognani / Red Hat / Virtualization
Re: [PATCH] ci: Switch from macOS 13 to macOS 15
Posted by Daniel P. Berrangé 2 weeks, 3 days ago 
On Wed, Sep 18, 2024 at 09:57:32PM +0900, Andrea Bolognani wrote:
> On Wed, Sep 18, 2024 at 02:33:10PM GMT, Daniel P. Berrangé wrote:
> > On Wed, Sep 18, 2024 at 04:32:25AM -0500, Andrea Bolognani wrote:
> > > On Tue, Sep 17, 2024 at 03:26:02PM GMT, Michal Privoznik wrote:
> > > > +aarch64-macos-15:
> > > > +  extends: .cirrus_build_job
> > > > +  needs: []
> > > > +  allow_failure: false
> > > > +  variables:
> > > > +    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest
> > >
> > > This is using the Sonoma (macOS 14) image, which is clearly wrong.
> > >
> > > The libvirt-ci patches were incorrect, and AFAICT Cirrus CI simply
> > > hasn't introduced support for macOS 15 yet, which isn't unexpected
> > > since the OS was released mere days ago. So
> >
> > Their docs say only sonoma, but their underlying git repo does in
> > fact show sequoia. They're currently exposing Beta images, which
> > is probably why they don't document it yet. Assuming the CI job
> > passes, I see no reason we can't use the sequoia images today though,
> > as they'll get updated to non-beta versions soon enough
> >
> > https://github.com/cirruslabs/macos-image-templates
> 
> I'd wait for them to be made GA.
> 
> New macOS releases have historically introduced changes that require
> libvirt to adapt, sometimes with significant effort, and I wouldn't
> want anyone to spend time investigating a build failure that can
> potentially affect the Beta version of the OS but not the GA one.

Actually I'm wrong. Looking more closely the sequoia image there
is an RC, not a Beta. The beta images was referring to 15.1, not
15.0, and they are named separately as sequoia-beta. Using an RC
is reliable enough IMHO


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] ci: Switch from macOS 13 to macOS 15
Posted by Andrea Bolognani 2 weeks, 3 days ago 
On Wed, Sep 18, 2024 at 03:02:58PM GMT, Daniel P. Berrangé wrote:
> On Wed, Sep 18, 2024 at 09:57:32PM +0900, Andrea Bolognani wrote:
> > On Wed, Sep 18, 2024 at 02:33:10PM GMT, Daniel P. Berrangé wrote:
> > > On Wed, Sep 18, 2024 at 04:32:25AM -0500, Andrea Bolognani wrote:
> > > > The libvirt-ci patches were incorrect, and AFAICT Cirrus CI simply
> > > > hasn't introduced support for macOS 15 yet, which isn't unexpected
> > > > since the OS was released mere days ago. So
> > >
> > > Their docs say only sonoma, but their underlying git repo does in
> > > fact show sequoia. They're currently exposing Beta images, which
> > > is probably why they don't document it yet. Assuming the CI job
> > > passes, I see no reason we can't use the sequoia images today though,
> > > as they'll get updated to non-beta versions soon enough
> > >
> > > https://github.com/cirruslabs/macos-image-templates
> >
> > I'd wait for them to be made GA.
> >
> > New macOS releases have historically introduced changes that require
> > libvirt to adapt, sometimes with significant effort, and I wouldn't
> > want anyone to spend time investigating a build failure that can
> > potentially affect the Beta version of the OS but not the GA one.
>
> Actually I'm wrong. Looking more closely the sequoia image there
> is an RC, not a Beta. The beta images was referring to 15.1, not
> 15.0, and they are named separately as sequoia-beta. Using an RC
> is reliable enough IMHO

I still think there's no reason to rush before the image is GA'd, but
if the build job succeeds with the RC image and there is no post-GA
churn involved I won't stand in the way of a libvirt-ci MR taking
that approach instead of mine[1].


[1] https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/502
-- 
Andrea Bolognani / Red Hat / Virtualization
Re: [PATCH] ci: Switch from macOS 13 to macOS 15
Posted by Daniel P. Berrangé 2 weeks, 3 days ago 
On Wed, Sep 18, 2024 at 10:34:31PM +0900, Andrea Bolognani wrote:
> On Wed, Sep 18, 2024 at 03:02:58PM GMT, Daniel P. Berrangé wrote:
> > On Wed, Sep 18, 2024 at 09:57:32PM +0900, Andrea Bolognani wrote:
> > > On Wed, Sep 18, 2024 at 02:33:10PM GMT, Daniel P. Berrangé wrote:
> > > > On Wed, Sep 18, 2024 at 04:32:25AM -0500, Andrea Bolognani wrote:
> > > > > The libvirt-ci patches were incorrect, and AFAICT Cirrus CI simply
> > > > > hasn't introduced support for macOS 15 yet, which isn't unexpected
> > > > > since the OS was released mere days ago. So
> > > >
> > > > Their docs say only sonoma, but their underlying git repo does in
> > > > fact show sequoia. They're currently exposing Beta images, which
> > > > is probably why they don't document it yet. Assuming the CI job
> > > > passes, I see no reason we can't use the sequoia images today though,
> > > > as they'll get updated to non-beta versions soon enough
> > > >
> > > > https://github.com/cirruslabs/macos-image-templates
> > >
> > > I'd wait for them to be made GA.
> > >
> > > New macOS releases have historically introduced changes that require
> > > libvirt to adapt, sometimes with significant effort, and I wouldn't
> > > want anyone to spend time investigating a build failure that can
> > > potentially affect the Beta version of the OS but not the GA one.
> >
> > Actually I'm wrong. Looking more closely the sequoia image there
> > is an RC, not a Beta. The beta images was referring to 15.1, not
> > 15.0, and they are named separately as sequoia-beta. Using an RC
> > is reliable enough IMHO
> 
> I still think there's no reason to rush before the image is GA'd, but
> if the build job succeeds with the RC image and there is no post-GA
> churn involved I won't stand in the way of a libvirt-ci MR taking
> that approach instead of mine[1].

By that rationale we also won't test against rawhide, or sid, etc.
IMHO the earlier we test against a platform the better, so if an
image is available we should use it.

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] ci: Switch from macOS 13 to macOS 15
Posted by Andrea Bolognani 2 weeks, 1 day ago 
On Wed, Sep 18, 2024 at 06:42:59PM GMT, Daniel P. Berrangé wrote:
> On Wed, Sep 18, 2024 at 10:34:31PM +0900, Andrea Bolognani wrote:
> > On Wed, Sep 18, 2024 at 03:02:58PM GMT, Daniel P. Berrangé wrote:
> > > On Wed, Sep 18, 2024 at 09:57:32PM +0900, Andrea Bolognani wrote:
> > > > I'd wait for them to be made GA.
> > > >
> > > > New macOS releases have historically introduced changes that require
> > > > libvirt to adapt, sometimes with significant effort, and I wouldn't
> > > > want anyone to spend time investigating a build failure that can
> > > > potentially affect the Beta version of the OS but not the GA one.
> > >
> > > Actually I'm wrong. Looking more closely the sequoia image there
> > > is an RC, not a Beta. The beta images was referring to 15.1, not
> > > 15.0, and they are named separately as sequoia-beta. Using an RC
> > > is reliable enough IMHO
> >
> > I still think there's no reason to rush before the image is GA'd, but
> > if the build job succeeds with the RC image and there is no post-GA
> > churn involved I won't stand in the way of a libvirt-ci MR taking
> > that approach instead of mine[1].
>
> By that rationale we also won't test against rawhide, or sid, etc.
> IMHO the earlier we test against a platform the better, so if an
> image is available we should use it.

Rawhide and sid are unstable targets *by design*, which we
acknowledge by allowing the respective jobs to fail without
considering the entire pipeline as failed.

This is more akin to adding e.g. Fedora 41 as a target when GA is not
out yet but RC is. Which is not something that, as far as I know,
we've ever done.

Anyway, I've approved the libvirt-ci MR fixing the image name.

Michal, if you squash in the obvious diff and confirm that the
pipeline still passes, you can have my

  Reviewed-by: Andrea Bolognani <abologna@redhat.com>

and push this.

-- 
Andrea Bolognani / Red Hat / Virtualization
Re: [PATCH] ci: Switch from macOS 13 to macOS 15
Posted by Daniel P. Berrangé 2 weeks, 3 days ago 
On Tue, Sep 17, 2024 at 03:26:02PM +0200, Michal Privoznik wrote:
> libvirt-ci added macOS 15 so let's introduce it and while at it
> drop macOS 13.
> 
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> ---
>  ci/cirrus/{macos-13.vars => macos-15.vars} |  0
>  ci/gitlab/builds.yml                       | 32 +++++++++++-----------
>  ci/manifest.yml                            | 14 +++++-----
>  3 files changed, 23 insertions(+), 23 deletions(-)
>  rename ci/cirrus/{macos-13.vars => macos-15.vars} (100%)
> 
> diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-15.vars
> similarity index 100%
> rename from ci/cirrus/macos-13.vars
> rename to ci/cirrus/macos-15.vars
> diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
> index 214119b902..6f78ba2e89 100644
> --- a/ci/gitlab/builds.yml
> +++ b/ci/gitlab/builds.yml
> @@ -624,22 +624,6 @@ x86_64-freebsd-14:
>      UPGRADE_COMMAND: pkg upgrade -y
>  
>  
> -aarch64-macos-13:
> -  extends: .cirrus_build_job
> -  needs: []
> -  allow_failure: false
> -  variables:
> -    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest
> -    CIRRUS_VM_IMAGE_SELECTOR: image
> -    CIRRUS_VM_INSTANCE_TYPE: macos_instance
> -    INSTALL_COMMAND: brew install
> -    NAME: macos-13
> -    PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
> -    PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
> -    UPDATE_COMMAND: brew update
> -    UPGRADE_COMMAND: brew upgrade
> -
> -
>  aarch64-macos-14:
>    extends: .cirrus_build_job
>    needs: []
> @@ -654,3 +638,19 @@ aarch64-macos-14:
>      PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
>      UPDATE_COMMAND: brew update
>      UPGRADE_COMMAND: brew upgrade
> +
> +
> +aarch64-macos-15:
> +  extends: .cirrus_build_job
> +  needs: []
> +  allow_failure: false
> +  variables:
> +    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest

I think we screwed up libvirt-ci, as sonoma is 14, sequoia is 15


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] ci: Switch from macOS 13 to macOS 15
Posted by Martin Kletzander 2 weeks, 3 days ago 
On Tue, Sep 17, 2024 at 03:26:02PM +0200, Michal Privoznik wrote:
>libvirt-ci added macOS 15 so let's introduce it and while at it
>drop macOS 13.
>
>Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

Let's see what breaks =)

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.