From patchwork Tue Sep 10 08:43:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173449 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5505033ilq; Tue, 10 Sep 2019 01:51:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxmlrIRY5BfGqrCiaYxacej6JICoZRlT/GBwinF4twHw7Ciua56UG3ZD5X54V9ioTOXyKwo X-Received: by 2002:ac8:48c5:: with SMTP id l5mr28740809qtr.374.1568105476480; Tue, 10 Sep 2019 01:51:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105476; cv=none; d=google.com; s=arc-20160816; b=flnIpYfxaI5hNaVdBsnkE2ydXjbOvwh/iOhGdZDdK9Kwb3V+kuYeSqZ5FO7LvW+SX3 c1kjfp0eDuiQmjuK/c2ydDw5VCnbxZ0R+AC1r4/j2dJAWPGUoRuFOc8aBlXwX7nCoqiL B4DeYP3p2mtv6JIf4A5YExmGzHw5pk6IyHBEve/BqyvUC2T73iKGmjNgzGyNcFSKWI7G YXQn0sbTnIoHlRGCY451eqWYQ8Xkni0/KMqWripzpVFz9hPWImNHWDAU2cLTaYAzGfp0 KcEZv+i8naDxwN0f/fmHjFHBdUmkR7IcUks4vUNYQXUiDiqqHxkavfR5DNdhR2VHZ803 isOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=KDgxLmV9jVX5RP5KnrkpNStJOerKcWSl/8g+dS8UE6M=; b=fQOcYpodnPImd5vvt3XjsP1uLGcZ0tsSnx7BvdU5gKG42bHAV+Xm7hS5yZAAki9Zx1 Fs8Yhj1D8o477ifcGiBmyVnZoU2m+2UQ2QtrbdrlVCYJLKn8JeoWs9x+jz0/IvEitJuy D9C1TRNLj2npil4ogo9uls+tBNeG0Khip4sWK15X8IwES6pTJG6OyLpInu1/2vlBbVgJ VgZ741rAkMx5qZqJ5fT80lTtM70Xr9wPEZ+cnVtJQqnUXDHMJ9X1iiRXKufm7xckopRF RLWIyuCl9x2JZ6WeXdzz1oP55xnUiGJKnZ6/o7I1y6mRWw0uLhxPLBF4b0K5rN5kqnKN DCLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="v1KkF/sP"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d12si11094228qtn.189.2019.09.10.01.51.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:51:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="v1KkF/sP"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7brn-00010f-By for patch@linaro.org; Tue, 10 Sep 2019 04:51:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35776) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bki-0003KY-Vm for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkh-0006Hy-N5 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:56 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:38320) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkh-0006H3-Fj for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:55 -0400 Received: by mail-wr1-x431.google.com with SMTP id l11so18361477wrx.5 for ; Tue, 10 Sep 2019 01:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KDgxLmV9jVX5RP5KnrkpNStJOerKcWSl/8g+dS8UE6M=; b=v1KkF/sPspWW2Ysrrka2Ve23e/7jaXrViTHbCnDciHiCW4xmE4rJHaOfcV5aCLuXxx 8Va8MvNQlIW8SUOv3cvCeDPSDuTEvubMB61NuWp8Gu/FEUghVOiTxAZ3TyYu4JoODuq8 etcziCWLJxQlK7pbFIYaUYUEVsgCojCos9xS6Bcf8tbnExCR1a1aHBpP7irxXICM8sZ/ GZIiKPxs6mZT5W6ZBe5gRpMTmxfuWyvUX6kdpKCq0vfsnDqIN/1oUqbawVoVVMjM7Cdm 8QZjstABrwgClOPIY+b4nrlaw8NtdhZS51ql9JCQyd9PAfcwAWt2lsUCIDgW8X7/NT5e jtkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KDgxLmV9jVX5RP5KnrkpNStJOerKcWSl/8g+dS8UE6M=; b=YHyR1iORF3nm6OpDo2nnuupOXm0GdMCFY3EnYBL5+IUbs8e2ZIMnUArqFMU44MJLVg wb6T3+XFdVcwPx9X6L5IxuCYc2Rur6EfiCmDPYb1rZw0c5U6oNBXf4VmBdirzHqGls0F JLZkiKSrZeXYv/otAJOlvKmmGgZlhXVV6EQxF1XlZ4kJU9CojwsaqlX02spflvYvc3fl grO7an6Vz7Wj7G5AvPGPdzi19wlj5wPVZKxHVZgpIRnYDI1+RGI0x0KAw/hRTaW6kEQg Jv47PhLhj2bwRLgQO0oKgVhhyyfsLQlP6h3PG76EbWIJZaatwnby+2NSf8kvTbwaas+X VfGQ== X-Gm-Message-State: APjAAAVDth8YlRlwHVqaBUt99RzbzBWmo5UpX0ErmVRBip1T25fuiCX3 2cOG423a5DfC6G+lJhLAbqoQOQ== X-Received: by 2002:adf:a382:: with SMTP id l2mr23749721wrb.194.1568105033594; Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n8sm3476630wma.7.2019.09.10.01.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C52871FF91; Tue, 10 Sep 2019 09:43:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:08 +0100 Message-Id: <20190910084349.28817-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PULL 04/45] tests/docker: fix "cc" command to work with podman X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Podman requires a little bit of additional magic to the uid mapping which was already done for the normal RunCommand. We simplify the logic by pushing it directly into the Docker::run method to avoid instantiating an extra Docker() object and ensure the CC command always runs as the current user. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 064026c8af8..1620293ac84 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -318,10 +318,18 @@ class Docker(object): return False return checksum == _text_checksum(_dockerfile_preprocess(dockerfile)) - def run(self, cmd, keep, quiet): + def run(self, cmd, keep, quiet, as_user=False): label = uuid.uuid1().hex if not keep: self._instances.append(label) + + if as_user: + uid = os.getuid() + cmd = [ "-u", str(uid) ] + cmd + # podman requires a bit more fiddling + if self._command[0] == "podman": + argv.insert(0, '--userns=keep-id') + ret = self._do_check(["run", "--label", "com.qemu.instance.uuid=" + label] + cmd, quiet=quiet) @@ -364,13 +372,8 @@ class RunCommand(SubCommand): help="Run container using the current user's uid") def run(self, args, argv): - if args.run_as_current_user: - uid = os.getuid() - argv = [ "-u", str(uid) ] + argv - docker = Docker() - if docker._command[0] == "podman": - argv.insert(0, '--userns=keep-id') - return Docker().run(argv, args.keep, quiet=args.quiet) + return Docker().run(argv, args.keep, quiet=args.quiet, + as_user=args.run_as_current_user) class BuildCommand(SubCommand): @@ -554,8 +557,6 @@ class CcCommand(SubCommand): help="The docker image in which to run cc") parser.add_argument("--cc", default="cc", help="The compiler executable to call") - parser.add_argument("--user", - help="The user-id to run under") parser.add_argument("--source-path", "-s", nargs="*", dest="paths", help="""Extra paths to (ro) mount into container for reading sources""") @@ -569,11 +570,10 @@ class CcCommand(SubCommand): if args.paths: for p in args.paths: cmd += ["-v", "%s:%s:ro,z" % (p, p)] - if args.user: - cmd += ["-u", args.user] cmd += [args.image, args.cc] cmd += argv - return Docker().command("run", cmd, args.quiet) + return Docker().run(cmd, False, quiet=args.quiet, + as_user=True) class CheckCommand(SubCommand): diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include index 73b5626fc5f..210f8428237 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.include @@ -41,7 +41,7 @@ ifneq ($(DOCKER_IMAGE),) # We also need the Docker make rules to depend on include $(SRC_PATH)/tests/docker/Makefile.include -DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \ +DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc \ --cc $(DOCKER_CROSS_COMPILER) \ -i qemu:$(DOCKER_IMAGE) \ -s $(SRC_PATH) -- "