[Qemu-commits] [qemu/qemu] 2461d8: docker.py: add --run-as-current-user

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2461d80e6c36dfefdcde1ec8735c317c31895c6b
      
https://github.com/qemu/qemu/commit/2461d80e6c36dfefdcde1ec8735c317c31895c6b
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-08-22 (Thu, 22 Aug 2019)

  Changed paths:
    M tests/docker/Makefile.include
    M tests/docker/docker.py

  Log Message:
  -----------
  docker.py: add --run-as-current-user

(podman will need further tweaks)

Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>


  Commit: 9459f754134bb786edf85ca9fc00f1805e67bd74
      
https://github.com/qemu/qemu/commit/9459f754134bb786edf85ca9fc00f1805e67bd74
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-08-22 (Thu, 22 Aug 2019)

  Changed paths:
    M tests/docker/docker.py

  Log Message:
  -----------
  docker.py: add podman support

Add a --engine option to select either docker, podman or auto.

Among other advantages, podman allows to run rootless & daemonless
containers, fortunately sharing compatible CLI with docker.

With current podman, we have to use a uidmap trick in order to be able
to rw-share the ccache directory with the container user.

With a user 1000, the default mapping is:                                       
                                                                                
                                                  1000 (host) -> 0 (container).
So write access to /var/tmp/ccache ends will end with permission
denied error.

With "--uidmap 1000:0:1 --uidmap 0:1:1000", the mapping is:
1000 (host) -> 0 (container, 1st namespace) -> 1000 (container, 2nd namespace).
(the rest is mumbo jumbo to avoid holes in the range of UIDs)

A future podman version may have an option such as --userns-keep-uid.
Thanks to Debarshi Ray <address@hidden> for the help!

Signed-off-by: Marc-André Lureau <address@hidden>
Acked-by: Alex Bennée <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>


  Commit: 05af039d1e0baec1e1577701ec8309313f832f06
      
https://github.com/qemu/qemu/commit/05af039d1e0baec1e1577701ec8309313f832f06
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-08-22 (Thu, 22 Aug 2019)

  Changed paths:
    M Makefile
    M tests/docker/Makefile.include

  Log Message:
  -----------
  tests/docker: add podman support

Allow to specify the container engine to run with ENGINE variable.

By default, ENGINE=auto and will select either podman or docker.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>


  Commit: 71714178fa35dff1b9afc0762501c81360f7db82
      
https://github.com/qemu/qemu/commit/71714178fa35dff1b9afc0762501c81360f7db82
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-08-22 (Thu, 22 Aug 2019)

  Changed paths:
    M tests/socket-helpers.c
    M tests/socket-helpers.h

  Log Message:
  -----------
  tests: specify the address family when checking bind

getaddrinfo() may succeed with PF_UNSPEC, but fail when more specific.

(this allows to skip some tests that would fail under podman)

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>


  Commit: e7b6ba4186f243f149b0d8cddc129fe681ba3912
      
https://github.com/qemu/qemu/commit/e7b6ba4186f243f149b0d8cddc129fe681ba3912
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-08-22 (Thu, 22 Aug 2019)

  Changed paths:
    M tests/Makefile.include
    M tests/test-char.c

  Log Message:
  -----------
  test-char: skip tcp tests if ipv4 check failed

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>


  Commit: a4eb74a66a0f34d53127e240c1eeae42073bc558
      
https://github.com/qemu/qemu/commit/a4eb74a66a0f34d53127e240c1eeae42073bc558
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-08-22 (Thu, 22 Aug 2019)

  Changed paths:
    M tests/test-char.c
    M tests/test-io-channel-socket.c
    M tests/test-util-sockets.c

  Log Message:
  -----------
  test: skip tests if socket_check_protocol_support() failed

Skip the tests if socket_check_protocol_support() failed, but do run
g_test_run() to keep TAP harness happy.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>


  Commit: 61146e9cb40c3f13f94447fe311efe73b1f2494b
      
https://github.com/qemu/qemu/commit/61146e9cb40c3f13f94447fe311efe73b1f2494b
  Author: Peter Maydell <address@hidden>
  Date:   2019-08-23 (Fri, 23 Aug 2019)

  Changed paths:
    M Makefile
    M tests/Makefile.include
    M tests/docker/Makefile.include
    M tests/docker/docker.py
    M tests/socket-helpers.c
    M tests/socket-helpers.h
    M tests/test-char.c
    M tests/test-io-channel-socket.c
    M tests/test-util-sockets.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/elmarco/tags/podman-pull-request' into 
staging

tests/docker: add podman support

# gpg: Signature made Thu 22 Aug 2019 14:46:51 BST
# gpg:                using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Marc-André Lureau <address@hidden>" [full]
# gpg:                 aka "Marc-André Lureau <address@hidden>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/podman-pull-request:
  test: skip tests if socket_check_protocol_support() failed
  test-char: skip tcp tests if ipv4 check failed
  tests: specify the address family when checking bind
  tests/docker: add podman support
  docker.py: add podman support
  docker.py: add --run-as-current-user

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/3590b27c7a2b...61146e9cb40c