From: Brad Hubbard <bhubbard@redhat.com>
Date: Tue, 22 Sep 2020 00:28:09 +0000 (+1000)
Subject: test/docker-test: Fix permissions issue when using podman
X-Git-Tag: v16.1.0~1018^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac20919c6c27081c41ba2fa3e1fed96cdd3ad98c;p=ceph.git

test/docker-test: Fix permissions issue when using podman

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/src/test/docker-test-helper.sh b/src/test/docker-test-helper.sh
index 80771eb14dd4..845996275899 100755
--- a/src/test/docker-test-helper.sh
+++ b/src/test/docker-test-helper.sh
@@ -126,6 +126,9 @@ function run_in_docker() {
     local cmd="$dockercmd run $opts --rm --name $image --privileged $ccache"
     cmd+=" --volume $downstream:$downstream"
     cmd+=" --volume $upstream:$upstream"
+    if test "$dockercmd" = "podman" ; then
+        cmd+=" --userns=keep-id"
+    fi
     local status=0
     if test "$script" = "SHELL" ; then
         $cmd --tty --interactive --workdir $downstream $user $image bash