From: Daniel P. Berrangé <[email protected]> This brings in a workaround for broken deps with OpenSUSE repos, by allowing downgrades.
Signed-off-by: Daniel P. Berrangé <[email protected]> --- 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 986c27a4a7..55d9fe5974 100644 --- a/ci/buildenv/opensuse-leap-15.sh +++ b/ci/buildenv/opensuse-leap-15.sh @@ -7,7 +7,7 @@ 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 a01e3c35d0..ff1c4800e4 100644 --- a/ci/buildenv/opensuse-tumbleweed.sh +++ b/ci/buildenv/opensuse-tumbleweed.sh @@ -6,7 +6,7 @@ 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 bf605dc22f..8857f35ce0 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -8,7 +8,7 @@ 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 e8062d2849..07c930b48b 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -7,7 +7,7 @@ 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
