9:54 a.m.
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/620665364
Now that the test suite issues that were blocking the switch have
been addressed, we can finally jump on the current macOS release.
Andrea Bolognani (2):
ci: Refresh generated files
ci: Switch from macOS 11 to macOS 12
ci/cirrus/{macos-11.vars => macos-12.vars} | 0
ci/containers/centos-stream-9.Dockerfile | 5 +++++
ci/containers/opensuse-leap-153.Dockerfile | 2 +-
ci/containers/ubuntu-2004.Dockerfile | 2 +-
ci/gitlab/builds.yml | 6 +++---
ci/manifest.yml | 2 +-
6 files changed, 11 insertions(+), 6 deletions(-)
rename ci/cirrus/{macos-11.vars => macos-12.vars} (100%)
--
2.37.2
9:54 a.m.
New subject: [libvirt PATCH 1/2] ci: Refresh generated files
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/containers/centos-stream-9.Dockerfile | 5 +++++
ci/containers/opensuse-leap-153.Dockerfile | 2 +-
ci/containers/ubuntu-2004.Dockerfile | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ci/containers/centos-stream-9.Dockerfile
b/ci/containers/centos-stream-9.Dockerfile
index 5d0b5ffc6c..3981765fd5 100644
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@@ -69,6 +69,9 @@ RUN dnf distro-sync -y && \
polkit \
python3 \
python3-docutils \
+ python3-pip \
+ python3-setuptools \
+ python3-wheel \
qemu-img \
readline-devel \
rpcgen \
@@ -88,6 +91,8 @@ RUN dnf distro-sync -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+RUN /usr/bin/pip3 install flake8
+
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
ENV NINJA "/usr/bin/ninja"
diff --git a/ci/containers/opensuse-leap-153.Dockerfile
b/ci/containers/opensuse-leap-153.Dockerfile
index 583e994716..eeba0a327a 100644
--- a/ci/containers/opensuse-leap-153.Dockerfile
+++ b/ci/containers/opensuse-leap-153.Dockerfile
@@ -91,7 +91,7 @@ RUN zypper update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-RUN pip3 install meson==0.56.0
+RUN /usr/bin/pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 81115ab338..466b045fe4 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -97,7 +97,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-RUN pip3 install meson==0.56.0
+RUN /usr/bin/pip3 install meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
--
2.37.2
9:54 a.m.
New subject: [libvirt PATCH 2/2] ci: Switch from macOS 11 to macOS 12
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/cirrus/{macos-11.vars => macos-12.vars} | 0
ci/gitlab/builds.yml | 6 +++---
ci/manifest.yml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
rename ci/cirrus/{macos-11.vars => macos-12.vars} (100%)
diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-12.vars
similarity index 100%
rename from ci/cirrus/macos-11.vars
rename to ci/cirrus/macos-12.vars
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 4e8c3d3510..e51cce65b6 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -488,16 +488,16 @@ x86_64-freebsd-13:
UPGRADE_COMMAND: pkg upgrade -y
-x86_64-macos-11:
+x86_64-macos-12:
extends: .cirrus_build_job
needs: []
allow_failure: false
variables:
- CIRRUS_VM_IMAGE_NAME: big-sur-base
+ CIRRUS_VM_IMAGE_NAME: monterey-base
CIRRUS_VM_IMAGE_SELECTOR: image
CIRRUS_VM_INSTANCE_TYPE: osx_instance
INSTALL_COMMAND: brew install
- NAME: macos-11
+ NAME: macos-12
PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/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
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 1adab5aa92..865a82a4a9 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -173,7 +173,7 @@ targets:
variables:
RPM: skip
- macos-11:
+ macos-12:
jobs:
- arch: x86_64
variables:
--
2.37.2
10:22 a.m.
On 8/23/22 16:54, Andrea Bolognani wrote:
Test pipeline:
https://gitlab.com/abologna/libvirt/-/pipelines/620665364
Now that the test suite issues that were blocking the switch have
been addressed, we can finally jump on the current macOS release.
Andrea Bolognani (2):
ci: Refresh generated files
ci: Switch from macOS 11 to macOS 12
ci/cirrus/{macos-11.vars => macos-12.vars} | 0
ci/containers/centos-stream-9.Dockerfile | 5 +++++
ci/containers/opensuse-leap-153.Dockerfile | 2 +-
ci/containers/ubuntu-2004.Dockerfile | 2 +-
ci/gitlab/builds.yml | 6 +++---
ci/manifest.yml | 2 +-
6 files changed, 11 insertions(+), 6 deletions(-)
rename ci/cirrus/{macos-11.vars => macos-12.vars} (100%)
Yes please!
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
822
days inactive
822
days old
3 comments
2 participants
participants (2)
-
Andrea Bolognani -
Michal Prívozník