From: Michal Privoznik <mprivozn@redhat.com> Update FreeBSD to their new minor versions. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- Green pipeline (although it doesn't show cirrus jobs): https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/2194225996 There is also FreeBSD 15.0 which was released yesterday. But there are some issues with its availability in cirrus [1] so I'm not updating the majo version, for now. 1: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291354 ci/gitlab/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index XXXXXXX..XXXXXXX 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -XXX,XX +XXX,XX @@ x86_64-freebsd-13: allow_failure: exit_codes: 3 variables: - CIRRUS_VM_IMAGE_NAME: freebsd-13-4 + CIRRUS_VM_IMAGE_NAME: freebsd-13-5 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y @@ -XXX,XX +XXX,XX @@ x86_64-freebsd-14: allow_failure: exit_codes: 3 variables: - CIRRUS_VM_IMAGE_NAME: freebsd-14-2 + CIRRUS_VM_IMAGE_NAME: freebsd-14-3 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y -- 2.51.2 From: Daniel P. Berrangé <berrange@redhat.com> This brings in a workaround for broken deps with OpenSUSE repos, by allowing downgrades. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- ci/buildenv/opensuse-leap-15.sh | 2 +- ci/buildenv/opensuse-tumbleweed.sh | 2 +- ci/containers/opensuse-leap-15.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh index XXXXXXX..XXXXXXX 100644 --- a/ci/buildenv/opensuse-leap-15.sh +++ b/ci/buildenv/opensuse-leap-15.sh @@ -XXX,XX +XXX,XX @@ function install_buildenv() { zypper update -y zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo - zypper install -y \ + zypper install -y --allow-downgrade \ audit-devel \ augeas \ augeas-lenses \ diff --git a/ci/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh index XXXXXXX..XXXXXXX 100644 --- a/ci/buildenv/opensuse-tumbleweed.sh +++ b/ci/buildenv/opensuse-tumbleweed.sh @@ -XXX,XX +XXX,XX @@ function install_buildenv() { zypper dist-upgrade -y - zypper install -y \ + zypper install -y --allow-downgrade \ audit-devel \ augeas \ augeas-lenses \ diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index XXXXXXX..XXXXXXX 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -XXX,XX +XXX,XX @@ FROM registry.opensuse.org/opensuse/leap:15.6 RUN zypper update -y && \ zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo && \ - zypper install -y \ + zypper install -y --allow-downgrade \ audit-devel \ augeas \ augeas-lenses \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index XXXXXXX..XXXXXXX 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -XXX,XX +XXX,XX @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest RUN zypper dist-upgrade -y && \ - zypper install -y \ + zypper install -y --allow-downgrade \ audit-devel \ augeas \ augeas-lenses \ -- 2.54.0