From d838c08b301355e9acdefa33608dd88966d7e829 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Fri, 24 Feb 2023 05:49:45 -0700 Subject: [PATCH] buildah-bud tests: don't sudo when rootless is desired Followup to #17608, rootless buildah-bud in cron. I forgot one crucial step, skipping the sudo. Signed-off-by: Ed Santiago --- test/buildah-bud/run-buildah-bud-tests | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/buildah-bud/run-buildah-bud-tests b/test/buildah-bud/run-buildah-bud-tests index 8c8117abff..591dcf532d 100755 --- a/test/buildah-bud/run-buildah-bud-tests +++ b/test/buildah-bud/run-buildah-bud-tests @@ -105,8 +105,10 @@ set -e # 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 # for checkout; only when running tests) -if [[ -n $do_test ]]; then - sudo --validate +export SUDO= +if [[ -n $do_test ]] && ! [[ "$PRIV_NAME" == "rootless" ]]; then + SUDO=sudo + $SUDO --validate fi # 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 - (set -x;sudo env TMPDIR=/var/tmp \ + (set -x;$SUDO env TMPDIR=/var/tmp \ PODMAN_BINARY=$PODMAN_BINARY \ PODMAN_SERVER_LOG=$PODMAN_SERVER_LOG \ REMOTE=$REMOTE \