CI: For LDAP tests, switch to using OpenLDAP slapd running on

CentOS Stream 9.

Github: closes #450

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

diff --git a/test/travis_Dockerfile_slapd.centos b/test/travis_Dockerfile_slapd.centos
new file mode 100644 (file)
index 0000000..713e5de
--- /dev/null
+++ b/test/travis_Dockerfile_slapd.centos
@@ -0,0 +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='*'
+CMD /usr/sbin/slapd -u ldap -d1 '-h ldap:// ldapi:///'

diff --git a/test/travis_Dockerfile_slapd.centos7 b/test/travis_Dockerfile_slapd.centos7
deleted file mode 100644 (file)
index 85bcf0a..0000000
--- a/test/travis_Dockerfile_slapd.centos7
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM quay.io/centos/centos:7
-RUN yum install -y yum-utils && \
-    yum install -y openldap openldap-clients openldap-servers openldap-devel && \
-    yum -y clean all --enablerepo='*'
-CMD /usr/sbin/slapd -u ldap -d1 '-h ldap:// ldapi:///'

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 32fbbb8b9099a63cb048e8183c97d7d056ca2808..4094959b50915de837df64a95d2831ed3a54666e 100755 (executable)
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -97,7 +97,7 @@ fi
 # For LDAP testing, run slapd listening on port 8389 and populate the
 # directory as described in t/modules/ldap.t in the test framework:
 if test -v TEST_LDAP -a -x test/perl-framework/scripts/ldap-init.sh; then
-    docker build -t httpd_ldap -f test/travis_Dockerfile_slapd.centos7 test/
+    docker build -t httpd_ldap -f test/travis_Dockerfile_slapd.centos test/
     pushd test/perl-framework
        ./scripts/ldap-init.sh
     popd