opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17626 from edsantiago/buildah_bud_rootless

Browse Source 
buildah-bud tests: don't sudo when rootless is desired
This commit is contained in:
OpenShift Merge Robot
2023-02-27 12:02:46 +01:00
committed by GitHub
parent d37bca5f2d d838c08b30
commit a54a4041c5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/buildah-bud/run-buildah-bud-tests
View File

@ -105,8 +105,10 @@ set -e
# during the git-checkout-buildah step, then come back twenty minutes later # during the git-checkout-buildah step, then come back twenty minutes later
# to an expired sudo prompt and no tests have run. (No need to do this # to an expired sudo prompt and no tests have run. (No need to do this
# for checkout; only when running tests) # for checkout; only when running tests)
if [[ -n $do_test ]]; then export SUDO=
sudo --validate if [[ -n $do_test ]] && ! [[ "$PRIV_NAME" == "rootless" ]]; then
SUDO=sudo
$SUDO --validate
fi fi
# Before pulling buildah (while still cd'ed to podman repo), try to determine # Before pulling buildah (while still cd'ed to podman repo), try to determine
@ -227,7 +229,7 @@ review the test failure and double-check your changes.
" "
fi fi
(set -x;sudo env TMPDIR=/var/tmp \ (set -x;$SUDO env TMPDIR=/var/tmp \
PODMAN_BINARY=$PODMAN_BINARY \ PODMAN_BINARY=$PODMAN_BINARY \
PODMAN_SERVER_LOG=$PODMAN_SERVER_LOG \ PODMAN_SERVER_LOG=$PODMAN_SERVER_LOG \
REMOTE=$REMOTE \ REMOTE=$REMOTE \