Skip to content

Commit 91254f1

Browse files
committed
tests(integration): use pre-build ldap container image
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
1 parent 8e89104 commit 91254f1

File tree

3 files changed

+1
-103
lines changed

3 files changed

+1
-103
lines changed

.github/workflows/integration.yml

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,9 @@ jobs:
3737

3838
services:
3939
directory:
40-
image: quay.io/389ds/dirsrv:latest
40+
image: ghcr.io/nextcloud/continuous-integration-user_saml-dirsrv:latest
4141
ports:
4242
- 389:3389/tcp
43-
env:
44-
DS_DM_PASSWORD: admin
45-
DS_SUFFIX_NAME: dc=idptestbed
4643
options:
4744
--name directory
4845
sso:
@@ -60,28 +57,6 @@ jobs:
6057
#- name: Test sso container
6158
#run: curl 'https://localhost:4443/idp/profile/SAML2/Redirect/SSO?SAMLRequest=nZJbj9MwEIXf%2BytWeW%2BduOnNaiuVLZdKpa2awgMvq6kzoZYc23gcWP49TgK7gMQ%2BMJYseezzac6RlwS1dmLThJs545cGKQzuYj3W2pDoLldJ442wQIqEgRpJBCmKzfu94KNUOG%2BDlVYnf8leVgER%2BqCs6WW77So5Hl7vj293hwd%2BzasK8mwOc15Opnk5wSpf5LOx5ItJCrzKJsBheu2lH9FT5KySiE0GPY2owZ2hACbEfsrHw3QxzLJLNhV8Jvj4Uy%2FdRrPKQOjktxAcCcYyPhulcWUiz%2FMxU6Vj0WKlNLJ2es7OWCqPMrCiOPac088IXilTKvP5ZefX%2FhGJd5fLaXg6FpcesvmVyL011NToC%2FRflcQP530%2FXJxNWwn6ZimIeTpPWSTh48jdHAPniDUR8NBGz7oNJCXrDr1sz6JLxa%2F%2FB1VjgBICLNnvpGe2E4foc7c9Wa3k967f1hvrawj%2FjiOLIbcdVQ6r7qloDDmUqlJYJk%2BYjdb2271HCLhKgm8wuWPrQT%2FLnz93%2FQM%3D&RelayState=http%3A%2F%2Flocalhost%3A8080%2Findex.php%2Fapps%2Fuser_saml%2Fsaml%2Flogin&SigAlg=http%3A%2F%2Fwww.w3.org%2F2001%2F04%2Fxmldsig-more%23rsa-sha256&Signature=ZsTglbAjFrUgyBsUcm1cMOyHV7rzXTr9YM4E38fXiS1mXT5HNfy%2BR4ho6DCYXAuCmcYQwzJ8EiMAFYAHdUQZt8EkCHcV10qvL2hKhkMMxkvRL2%2FYPSdrvit8VfSpwgbOYrZOAu4re5JDU%2F5CWJ2tZpRYfokA0gldS%2BFuodqETGqRthZB9ge7oTmQUUbH7RxlmU8UCiwfWc0RtUNC4P%2FrsVwDS9bUgAzrqOqs7KOoCnrJPn08Fdz2RmoxJapdmBt9BAHxeDce5RPo%2BIoI5c8JDIPcUEuhImWJFXJnoQRIkJLYIIfgoqoj%2Bgtc6Np1%2BOeHJBSzlATZqiOWUIInfarjBg%3D%3D' || sleep 20
6259

63-
- name: Initialize LDAP Service
64-
shell: bash
65-
run: |
66-
CONTAINER_NAME=directory
67-
# Initialize LDAP Database. May wait until server is ready.
68-
while : ; do
69-
sleep 1
70-
if docker exec ${{ env.LDAP_CR_NAME }} dsconf localhost backend create --suffix "${{ env.LDAP_SUFFIX }}" --be-name ci_root; then
71-
break;
72-
fi
73-
if [ $(docker exec ${{ env.LDAP_CR_NAME }} dsconf localhost backend suffix list | grep "${{ env.LDAP_SUFFIX }}" | wc -l) -eq 1 ]; then
74-
break
75-
fi
76-
done
77-
# Add custom schema
78-
docker cp apps/${{ env.APP_NAME }}/tests/integration/data/98nextcloud-schema.ldif ${{ env.LDAP_CR_NAME }}:/etc/dirsrv/slapd-localhost/schema/
79-
docker exec ${{ env.LDAP_CR_NAME }} dsconf localhost schema reload
80-
# Add test entries
81-
docker cp apps/${{ env.APP_NAME }}/tests/integration/data/entries.ldif ${{ env.LDAP_CR_NAME }}:/var/opt/
82-
docker exec ${{ env.LDAP_CR_NAME }} dsconf localhost backend import "${{ env.LDAP_SUFFIX }}" /var/opt/entries.ldif
83-
date
84-
8560
- name: Checkout server
8661
uses: actions/checkout@v3
8762
with:

tests/integration/data/98nextcloud-schema.ldif

Lines changed: 0 additions & 13 deletions
This file was deleted.

tests/integration/data/entries.ldif

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)