From: Joe Orton <jorton@apache.org>
Date: Fri, 31 Jan 2025 14:28:57 +0000 (+0000)
Subject: CI: Try to cope with CentOS Stream containers being out-of-sync with
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0ba38c2527e31b13e96aafc41c60bf9aa7a16383;p=thirdparty%2Fapache%2Fhttpd.git

CI: Try to cope with CentOS Stream containers being out-of-sync with
the yum repos when building the slapd container. [skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1923479 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/travis_Dockerfile_slapd.centos b/test/travis_Dockerfile_slapd.centos
index 713e5de507..921927733d 100644
--- a/test/travis_Dockerfile_slapd.centos
+++ b/test/travis_Dockerfile_slapd.centos
@@ -1,5 +1,5 @@
 FROM quay.io/centos/centos:stream9
-RUN dnf install -y epel-release && \
-    dnf install -y openldap openldap-clients openldap-servers openldap-devel && \
-    dnf -y clean all --enablerepo='*'
+RUN rpm -q openldap-servers || (dnf install --refresh -y epel-release && \
+    dnf install --nobest -y openldap-clients openldap-servers openldap-devel && \
+    dnf -y clean all --enablerepo='*')
 CMD /usr/sbin/slapd -u ldap -d1 '-h ldap:// ldapi:///'