Skip tests on systems with restricted usernamespaces (backport #12051) #12183
+29
−5
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
…r namespaces Update tests/functional/common/functions.sh Co-authored-by: Robert Hensing <[email protected]> (cherry picked from commit da7f7ba) # Conflicts: # tests/functional/common/vars-and-functions.sh # tests/functional/supplementary-groups.sh
|
Cherry-pick of da7f7ba has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
github-actions
bot
added
the
with-tests
bryango
suggested changes
Jan 10, 2025
Comment on lines
+408
to
+423
| <<<<<<< HEAD:tests/functional/common/vars-and-functions.sh | ||
| fi # COMMON_VARS_AND_FUNCTIONS_SH_SOURCED | ||
| ======= | ||
| requiresUnprivilegedUserNamespaces() { | ||
| if [[ -f /proc/sys/kernel/apparmor_restrict_unprivileged_userns ]] && [[ $(< /proc/sys/kernel/apparmor_restrict_unprivileged_userns) -eq 1 ]]; then | ||
| skipTest "Unprivileged user namespaces are disabled. Run 'sudo sysctl -w /proc/sys/kernel/apparmor_restrict_unprivileged_userns=0' to allow, and run these tests." | ||
| fi | ||
| } | ||
|
|
||
| execUnshare () { | ||
| requiresUnprivilegedUserNamespaces | ||
| exec unshare --mount --map-root-user "$SHELL" "$@" | ||
| } | ||
|
|
||
| fi # COMMON_FUNCTIONS_SH_SOURCED | ||
| >>>>>>> da7f7ba81 (functional-tests: skip tests if the kernel restricts unprivileged user namespaces):tests/functional/common/functions.sh |
There was a problem hiding this comment.
Suggested change
| <<<<<<< HEAD:tests/functional/common/vars-and-functions.sh | |
| fi # COMMON_VARS_AND_FUNCTIONS_SH_SOURCED | |
| ======= | |
| requiresUnprivilegedUserNamespaces() { | |
| if [[ -f /proc/sys/kernel/apparmor_restrict_unprivileged_userns ]] && [[ $(< /proc/sys/kernel/apparmor_restrict_unprivileged_userns) -eq 1 ]]; then | |
| skipTest "Unprivileged user namespaces are disabled. Run 'sudo sysctl -w /proc/sys/kernel/apparmor_restrict_unprivileged_userns=0' to allow, and run these tests." | |
| fi | |
| } | |
| execUnshare () { | |
| requiresUnprivilegedUserNamespaces | |
| exec unshare --mount --map-root-user "$SHELL" "$@" | |
| } | |
| fi # COMMON_FUNCTIONS_SH_SOURCED | |
| >>>>>>> da7f7ba81 (functional-tests: skip tests if the kernel restricts unprivileged user namespaces):tests/functional/common/functions.sh | |
| requiresUnprivilegedUserNamespaces() { | |
| if [[ -f /proc/sys/kernel/apparmor_restrict_unprivileged_userns ]] && [[ $(< /proc/sys/kernel/apparmor_restrict_unprivileged_userns) -eq 1 ]]; then | |
| skipTest "Unprivileged user namespaces are disabled. Run 'sudo sysctl -w /proc/sys/kernel/apparmor_restrict_unprivileged_userns=0' to allow, and run these tests." | |
| fi | |
| } | |
| execUnshare () { | |
| requiresUnprivilegedUserNamespaces | |
| exec unshare --mount --map-root-user "$SHELL" "$@" | |
| } | |
| fi # COMMON_VARS_AND_FUNCTIONS_SH_SOURCED |
Comment on lines
+12
to
+16
| <<<<<<< HEAD | ||
| unshare --mount --map-root-user bash <<EOF | ||
| ======= | ||
| execUnshare <<EOF | ||
| >>>>>>> da7f7ba81 (functional-tests: skip tests if the kernel restricts unprivileged user namespaces) |
There was a problem hiding this comment.
Suggested change
| <<<<<<< HEAD | |
| unshare --mount --map-root-user bash <<EOF | |
| ======= | |
| execUnshare <<EOF | |
| >>>>>>> da7f7ba81 (functional-tests: skip tests if the kernel restricts unprivileged user namespaces) | |
| execUnshare <<EOF |
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.
Depends on #12050
This makes ci pass: https://github.com/NixOS/nix/actions/runs/12329995455/job/34414955507?pr=12051
even on systems that have restricted usernamespaces: 6642863
This is an automatic backport of pull request #12051 done by Mergify.