Skip to content

[stable30] fix: Flaky samba kerberos tests #52580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SystemKeeper merged 2 commits into from
May 1, 2025
Merged

[stable30] fix: Flaky samba kerberos tests #52580

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eb5b04
chore: Add logs for dc and apache container
SystemKeeper May 1, 2025
30626c9
fix: Ensure samba is started in kerberos tests
SystemKeeper May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix: Ensure samba is started in kerberos tests 
Signed-off-by: Marcel Müller <[email protected]>
  • Loading branch information
@SystemKeeper @backportbot
SystemKeeper authored and backportbot[bot] committed May 1, 2025
commit 30626c908bb99d42bcf74d69eb41a6579b7ad5c7
3 changes: 3 additions & 0 deletions apps/files_external/tests/sso-setup/start-apache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ APACHE_IP=$(docker inspect apache --format '{{.NetworkSettings.IPAddress}}')
docker exec apache chown 33 /var/www/html/config /var/www/html/data /var/www/html/extra-apps
docker cp "$SCRIPT_DIR/apps.config.php" apache:/var/www/html/config/apps.config.php

# ensure that samba is started (see https://github.com/icewind1991/samba-krb-test/pull/8)
docker exec dc service samba-ad-dc status || docker exec dc service samba-ad-dc start

# add the dns record for apache
docker exec dc samba-tool dns add krb.domain.test domain.test httpd A $APACHE_IP -U administrator --password=passwOrd1 1>&2

Expand Down
Loading