Message ID | 4b9204cc8ade1c965dc5412c53c6f7c5b4f019a2.1569413332.git.tgolembi@redhat.com |
---|---|
State | New |
Headers | show |
Series | docker: fix uid maping with podman | expand |
On 9/25/19 2:09 PM, Tomáš Golembiovský wrote: > Commit 71ebbe09 refactored how uid mapping is performed when invoking > container. It however introduced a bug in the flow when podman is used > caused by wrong variable name. Thanks Tomáš, but there is already a fix for this on the list: https://www.mail-archive.com/qemu-devel@nongnu.org/msg647275.html > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> > --- > tests/docker/docker.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/docker/docker.py b/tests/docker/docker.py > index 29613afd48..bc7a470ca2 100755 > --- a/tests/docker/docker.py > +++ b/tests/docker/docker.py > @@ -334,7 +334,7 @@ class Docker(object): > cmd = [ "-u", str(uid) ] + cmd > # podman requires a bit more fiddling > if self._command[0] == "podman": > - argv.insert(0, '--userns=keep-id') > + cmd.insert(0, '--userns=keep-id') > > ret = self._do_check(["run", "--label", > "com.qemu.instance.uuid=" + label] + cmd, >
Patchew URL: https://patchew.org/QEMU/4b9204cc8ade1c965dc5412c53c6f7c5b4f019a2.1569413332.git.tgolembi@redhat.com/ Hi, This series failed the asan build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally. === TEST SCRIPT BEGIN === #!/bin/bash export ARCH=x86_64 make docker-image-fedora V=1 NETWORK=1 time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1 === TEST SCRIPT END === The full log is available at http://patchew.org/logs/4b9204cc8ade1c965dc5412c53c6f7c5b4f019a2.1569413332.git.tgolembi@redhat.com/testing.asan/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
On 9/26/19 1:31 AM, no-reply@patchew.org wrote: > Patchew URL: https://patchew.org/QEMU/4b9204cc8ade1c965dc5412c53c6f7c5b4f019a2.1569413332.git.tgolembi@redhat.com/ > > Hi, > > This series failed the asan build test. Please find the testing commands and > their output below. If you have Docker installed, you can probably reproduce it > locally. > > === TEST SCRIPT BEGIN === > #!/bin/bash > export ARCH=x86_64 > make docker-image-fedora V=1 NETWORK=1 > time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1 > === TEST SCRIPT END === > > The full log is available at > http://patchew.org/logs/4b9204cc8ade1c965dc5412c53c6f7c5b4f019a2.1569413332.git.tgolembi@redhat.com/testing.asan/?type=message. The issue does not seem related to this particular patch: SPHINX docs/specs Exception occurred: File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 612, in get_doctree doctree = pickle.load(f) _pickle.UnpicklingError: pickle data was truncated The full traceback has been saved in /tmp/sphinx-err-d58j1r8p.log, if you want to report the issue to the developers. Please also report this if it was a user error, so that a better error message can be provided next time. A bug report can be filed in the tracker at <https://github.com/sphinx-doc/sphinx/issues>. Thanks! make: *** [Makefile:990: docs/interop/index.html] Error 2
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 29613afd48..bc7a470ca2 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -334,7 +334,7 @@ class Docker(object): cmd = [ "-u", str(uid) ] + cmd # podman requires a bit more fiddling if self._command[0] == "podman": - argv.insert(0, '--userns=keep-id') + cmd.insert(0, '--userns=keep-id') ret = self._do_check(["run", "--label", "com.qemu.instance.uuid=" + label] + cmd,
Commit 71ebbe09 refactored how uid mapping is performed when invoking container. It however introduced a bug in the flow when podman is used caused by wrong variable name. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- tests/docker/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)