Merged
Conversation
Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>
Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>
9df2c85 to
99d23a4
Compare
Contributor
Author
|
/backport to stable31 |
Contributor
Author
|
/backport to stable30 |
skjnldsv
approved these changes
May 1, 2025
|
The backport to # Switch to the target branch and update it
git checkout stable30
git pull origin stable30
# Create the new backport branch
git checkout -b backport/52572/stable30
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 3cf7b8dd 99d23a43
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/52572/stable30Error: Failed to push branch backport/52572/stable30: remote: Invalid username or password. Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
Contributor
Author
|
/backport to stable30 |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The samba kerberos tests have become flaky "lately". After some debugging, it became clear, that samba in the dc container is not running when the tests are failing. The reason is that on start / restart of samba, the port 389 is still being used which terminates samba.
See https://github.com/nextcloud/server/actions/runs/14765943837/job/41457286732#step:6:124 for a debug run.
So there's no problem with the test itself, but with the test environment. The real fix seems to be icewind1991/samba-krb-test#8.
For now we can also ensure that samba is running to not fail the tests.