diff options
| author | Joe Orton <jorton@apache.org> | 2024-05-30 16:48:21 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2024-05-30 16:48:21 +0200 |
| commit | 84ecd2f2b97c706aa4b62d06ea7a56c943bb6c3d (patch) | |
| tree | d729eff15266c4930e9b893278f25a70540d9ca0 /test | |
| parent | Follow up to r1918022: MMN minor bump and checks for the new conn_state_e ali... (diff) | |
| download | apache2-84ecd2f2b97c706aa4b62d06ea7a56c943bb6c3d.tar.xz apache2-84ecd2f2b97c706aa4b62d06ea7a56c943bb6c3d.zip | |
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
Diffstat (limited to 'test')
| -rw-r--r-- | test/travis_Dockerfile_slapd.centos | 5 | ||||
| -rw-r--r-- | test/travis_Dockerfile_slapd.centos7 | 5 | ||||
| -rwxr-xr-x | test/travis_before_linux.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/travis_Dockerfile_slapd.centos b/test/travis_Dockerfile_slapd.centos new file mode 100644 index 0000000000..713e5de507 --- /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 index 85bcf0aa08..0000000000 --- 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 32fbbb8b90..4094959b50 100755 --- 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 |