From patchwork Mon Jun 18 13:07:02 2018 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: 138934 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3937940lji; Mon, 18 Jun 2018 06:12:17 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI6l+P3Vi2tHqLzqbcMbbozNBgXutpmsizu0ZGBdtFZTpaDWFtYXEix01lX09XUN9or6j/z X-Received: by 2002:a37:2150:: with SMTP id h77-v6mr10386748qkh.424.1529327537350; Mon, 18 Jun 2018 06:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327537; cv=none; d=google.com; s=arc-20160816; b=BiYg2H912zdyzfm+mlXjwTT143ExPFXHJqU6wC9RPXzgSRYnI3VpjWnbUSWnC2JNji BGQ8qYcOkxrd4Dz5JHMw8l5EL7ShuhQZuUjwCCF0Zip+3VuEI4dRdb8f33WFE/9L4Qkv SlGPfxvMI4raZlIQqcOBcVftm0Gg+JwCPkUSp54NqX2R5FHCf8qCAdO7YpYY3fh15HyR BPhY78Hil3xSm8jHbNd0MjcPZqChtWO4EyhswEI5Ob/1h2pMk2MiBZH/uhZ+O1J+bgV8 3gZ/wahoDM1Ri1hQo4bubd92dhGSeY+p0tLrU9Dlz/uR1tu4y5bxKCTH+QjG1Cc4VMjC 2pNg== 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:arc-authentication-results; bh=NfJ5U5jIFnzXeSOLBje2WDYfem2f4jhgHe0dDM3WbUA=; b=PzQG0SYe4kCji85jgFZELvFgZFfOwhkX3rhGyYWO3shG9ENB/PQPYCueHW41XlmhiH hSyAMx8c5bAxaKn+IYMqEiXTJaFQRssyA9rnwfF10Xg9WABGOXXQJ4KUQ0mzkyMyDcua pSBHNzQW2ncmf+HObouHDAVtihqgYHs2We2LCbyGueIN95DUcYBW/uM2U15UYysbLWnb gApRbN+1ruP0ekQ+wDDNg0eKO4NI/fkupSKJ63ooafBl1LI4L8Nhb+/8GZYOuRtRz7Eg qnaTNfCUlavEOKPtg91ZJ0+w/d+eNnC8UPvNEyFk1KSIv1bNMbrdFTIgk1UPYUMmzS0y bDHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WjzsTLA+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j37-v6si182993qtc.35.2018.06.18.06.12.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:12:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WjzsTLA+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:34730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtxA-0000qx-L0 for patch@linaro.org; Mon, 18 Jun 2018 09:12:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsJ-0005y3-OD for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsG-0002d8-Tx for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:15 -0400 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]:35100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsG-0002cj-OM for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:12 -0400 Received: by mail-wr0-x229.google.com with SMTP id l10-v6so16790011wrn.2 for ; Mon, 18 Jun 2018 06:07:12 -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=NfJ5U5jIFnzXeSOLBje2WDYfem2f4jhgHe0dDM3WbUA=; b=WjzsTLA+c4Z6qB/XcnO9EFXJqfwGPFtbKBazBGL+0fGRbl/A3x/LeEDEane7Ga8wGu hg54A76vz0iADoDUJUTQcdB8l3TDnjb4nuwmNawn+wtlYt9ggUQnMlkMwFiCruv5qqCG Rb0HC8KR/aOLD2fYxOZOqQ2JbtyahACFVcqco= 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=NfJ5U5jIFnzXeSOLBje2WDYfem2f4jhgHe0dDM3WbUA=; b=bQc4Ox7AxRZXgFdzd2SGmkOoCPGp+RsYn3bC+UEK2TVMB088uRRadq3A8D9Pcv00j2 po4nzM1sdsAZZdIhFPzlqh9SOLBmgaMr1S/bT32EV5JW7wpVjObD7c7i1/uIHHqLh6rm aLOzE1odyRxgbHfe1Fdv+7BymaMRmpKsnrXAX4QzUhByIq08nrnYNb3Ve+JPXIHsWb9c ak95GFTBRIM7+Dv2+HH820jph4L8974rxhwHFUVsIZ8DWgi7mfy5EtwW4FVz91S5XiXD C5BxZaxJtsLRm32MLFO5W3dnbUYcjcr4cGfG7L+5aHMm1hC7j/9UO29N5ohcsjhFSdvQ IYgQ== X-Gm-Message-State: APt69E3TGF4ncxfb+KyurwBexjhaO5YBBJ19ZV1PI9f/ThvLH3LOFLRQ 3UkmxNjC06lIcq5gik+UnxOkEg== X-Received: by 2002:adf:a706:: with SMTP id c6-v6mr10767272wrd.61.1529327231705; Mon, 18 Jun 2018 06:07:11 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c11-v6sm15253238wrm.65.2018.06.18.06.07.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4BD893E05F2; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:02 +0100 Message-Id: <20180618130709.19730-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-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:400c:c0c::229 Subject: [Qemu-devel] [PATCH v1 1/8] docker: Add "cc" subcommand X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Fam Zheng [AJB: add if args.paths check] Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v2 - add if args.paths check to avoid iterating null argument --- tests/docker/docker.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 306e14cf69..4cd6f9b8ec 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -409,6 +409,31 @@ class ProbeCommand(SubCommand): return +class CcCommand(SubCommand): + """Compile sources with cc in images""" + name = "cc" + + def args(self, parser): + parser.add_argument("--image", "-i", required=True, + help="The docker image in which to run cc") + parser.add_argument("--source-path", "-s", nargs="*", dest="paths", + help="""Extra paths to (ro) mount into container for + reading sources""") + + def run(self, args, argv): + if argv and argv[0] == "--": + argv = argv[1:] + cwd = os.getcwd() + cmd = ["--rm", "-w", cwd, + "-v", "%s:%s:rw" % (cwd, cwd)] + if args.paths: + for p in args.paths: + cmd += ["-v", "%s:%s:ro,z" % (p, p)] + cmd += [args.image, "cc"] + cmd += argv + return Docker().command("run", cmd, args.quiet) + + def main(): parser = argparse.ArgumentParser(description="A Docker helper", usage="%s ..." % os.path.basename(sys.argv[0])) From patchwork Mon Jun 18 13:07:03 2018 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: 138929 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3932980lji; Mon, 18 Jun 2018 06:07:45 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKNk5j584O/xMKJURoKEcAtRua2E2NeRfk4K3WlkNTkEgN9I7BJs0fe2LE7T7+pZZG7p7C6 X-Received: by 2002:ac8:327c:: with SMTP id y57-v6mr10956266qta.14.1529327265504; Mon, 18 Jun 2018 06:07:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327265; cv=none; d=google.com; s=arc-20160816; b=ZP9xQk7AwsVTjYfuAOTSRbr9rc0gc8HSa6G/gtV1u14AuDDSaiOk4jD8baqqZub2PH L3ip99lUSt6a+5ugXUweUS+Mwd9ptRAbZg+tIz3GZW8lPkvzbcKf9PSGbQ2FF+09c3Lp Ld5ART9iZOGRvtWnzW68OOo3z8G/NlthY9ut7TZ5bKDTnJslLLpCVyy02H7Hbx+Hutty Naprao2PBNksbzChgFO1xddBo1Q2l5CJcKH17GRCAzf8dNVcow91jJEfkvrGmmohHlEY oijMPlvja8BvqG6+/isJvhkv9J9Ollz1WitAQ6DleLI/d1FmWhr2P29JbYRKXiQW93/h roaQ== 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:arc-authentication-results; bh=0TZGa3eVh0CeTpRHUcHQmNG5wlIovi0NoSw/xt6gy/U=; b=bUzZa2hBL09vbO1k/4V4ZxtU7eh5d/aM5WShoWQlxWQHX/lZaQQ4qXD5LI4rk2ouPy fnM8Vy4StSBoP4Jx7V6bWiuJ9lXKham/B+2G87cwu8LlZw5d61F7RNJhOXeT2tWMQJ92 xL3FRJIsEPXBDmxdEY1K5ySsObKi0+R1pfXb+3Dsmp+DDjerbi/T+2kCnyLaUvZNjSoO 4XNMcdu+iNZZFR/KeOghHwVo7bRJwV/A6Zjo/N9gEwIRpgwEsUGSHAEIFCznscANugul wjXmXs6ijIZhZndB4Iq+s+uwD9SVa8G8/EmcLKvPrLd3dPTRjECxHfhwQ/aMknzev0LV IGlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=irzfAmaC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c5-v6si5505283qva.149.2018.06.18.06.07.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:07:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=irzfAmaC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:34711 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsm-00060F-Ua for patch@linaro.org; Mon, 18 Jun 2018 09:07:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsJ-0005y4-OA for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsH-0002dU-Rb for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:15 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:40646) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsH-0002d2-F7 for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:13 -0400 Received: by mail-wr0-x242.google.com with SMTP id l41-v6so16770321wre.7 for ; Mon, 18 Jun 2018 06:07:13 -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=0TZGa3eVh0CeTpRHUcHQmNG5wlIovi0NoSw/xt6gy/U=; b=irzfAmaCUtsINFGqMF0nmF57eF9Wd0WzILPh+fRlWx+duRqIyU6FErI66eisBT/3MO luDTk2eJy2Clvrl9lMSUsWRdEO+QY+gJ908TgXZjBVjP1CRHNlLQ5GkMY3JwhOEv7Xq6 k4zgcybjeJMekBB+E3PUZ8Y8AUR6XcSuMOdyQ= 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=0TZGa3eVh0CeTpRHUcHQmNG5wlIovi0NoSw/xt6gy/U=; b=uYiq8N+4HMGc/IQdQe3qiNUOYB5W9j+Yd3LoMTqzy16iDZbpvK45DphdrIRKJ9rYig geNk5o/iurZ5kOcnz4Y0u0cpHzbrnPuZEgKoplNl+jieu+G40HadKt/LcLDkZAFPPtUk xZohZbzwP8uKtLxMNfFqyof0E+LdEDGahownEfWWZvAJJYdIiwE01H7jVRMfgO4W+Y7r B0fww7bFJygMzZy6MpPEv5jYro4UytCHxDfvffmdJCoB0tWaBrfxg82H0S+2RiX556s2 0VpFJGFngu6/QV43RrZM6Y8hdfwA81dsvuabu+G14csBVOtVWcwuL53kCnDd6NKbaoEW +6TA== X-Gm-Message-State: APt69E0FlTDyEvJ3fEArT2D7lf2MLBNSnkmHF4ch5plQ8c1cVKsGCY/r NGsnINwvF9uHpSJaoqYSs9zR0Q== X-Received: by 2002:a5d:4392:: with SMTP id i18-v6mr10926092wrq.156.1529327232426; Mon, 18 Jun 2018 06:07:12 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i6-v6sm15391392wrr.2.2018.06.18.06.07.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 624403E0632; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:03 +0100 Message-Id: <20180618130709.19730-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-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:400c:c0c::242 Subject: [Qemu-devel] [PATCH v1 2/8] docker: extend "cc" command to accept compiler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When calling our cross-compilation images we want to call something other than the default cc. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Fam Zheng --- v2 - use arg.cc default to simplify logic --- tests/docker/docker.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 4cd6f9b8ec..663dfcba4b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -416,6 +416,8 @@ class CcCommand(SubCommand): def args(self, parser): parser.add_argument("--image", "-i", required=True, help="The docker image in which to run cc") + parser.add_argument("--cc", default="cc", + help="The compiler executable to call") parser.add_argument("--source-path", "-s", nargs="*", dest="paths", help="""Extra paths to (ro) mount into container for reading sources""") @@ -429,7 +431,7 @@ class CcCommand(SubCommand): if args.paths: for p in args.paths: cmd += ["-v", "%s:%s:ro,z" % (p, p)] - cmd += [args.image, "cc"] + cmd += [args.image, args.cc] cmd += argv return Docker().command("run", cmd, args.quiet) From patchwork Mon Jun 18 13:07:04 2018 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: 138933 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3936155lji; Mon, 18 Jun 2018 06:10:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKsDX8jAWNOGVVweTYEOBtZrY6AT7i+Hjs1BDSeq3XYOl9EpEA/R3nrVKQJmBta2iy7Bcwl X-Received: by 2002:a37:c9d3:: with SMTP id m80-v6mr9821713qkl.173.1529327441616; Mon, 18 Jun 2018 06:10:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327441; cv=none; d=google.com; s=arc-20160816; b=H+Leu8MycESY2LrKylTAqjM7bN7BVqAKNvoRpHhpnciJ36bE1ZJUwfDo19GDp8s6Vs 2ZrNLivfLGCWUmXUQjieumoicDAtevbQJydbO0wvgXCSVO5LwanSEmFnNvmCOciuwArn x/onAxtthWslMhiRhCNnDf8Bk8qq/RthhLdbc95EicM9OQla7URBKIO/Krp+ciBgjZhm OGty+P8OnIL7w9imGpMZZe3B7gPWetlcPl1KTgGs4tt8vAwTgwvSOwafiSl+h+JogvtI MNe2uXP734usFyol2sLW1+srgDccEHqRUo9Mf/U2DkK7S6rQFvYRUWDdtZLVzgvRBRfC pcUA== 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:arc-authentication-results; bh=RSP5eqkQNwptuq4lPD33K39JzkY2J7sMdSmKB/i3gy0=; b=rW8tA1cDSDEpk0u23opxchiCT0Cjezpl8iigZRZLx7engIB1rC75CYHSyht+Jz2guo 7E0HAsTbZ0vvRjaghGirKi2G0bno2Qr8GPUCR9UvFaYGtpf1F6ENAGaG7xeI9p1NKW8I AAPp9fk7hMvRpNxpgSLznrvUlfILDSlJADaamMz7c+DT9sQeJRZhtQFetfeCFI/MxBfs D1osx+G/Z5d4ARMUZZ+c09anXhWHgOZuXhuDOvINBIZ4TWsG4I6kJp2vC/xbrfLAEm/O wBymRgFttUS3+K8aXRkFEwNuVc/tb37IN19kzrLlny8AQBPUznEUUnIeRTIhvPmYrwNa zu6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="CPEl4JH/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x188-v6si2225201qke.369.2018.06.18.06.10.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:10:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="CPEl4JH/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:34726 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtvd-0008VE-1P for patch@linaro.org; Mon, 18 Jun 2018 09:10:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsN-0005yH-At for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsI-0002dp-Id for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:19 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:40713) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsI-0002dM-Bs for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:14 -0400 Received: by mail-wm0-x243.google.com with SMTP id n5-v6so15434209wmc.5 for ; Mon, 18 Jun 2018 06:07:14 -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=RSP5eqkQNwptuq4lPD33K39JzkY2J7sMdSmKB/i3gy0=; b=CPEl4JH/QX1/3CMZoDivBnph1aGz0yWD7ZqNS+QyCJEz0cTIj6bQbFuOgTB/YXe3Bt wNIOAXdbv1KLNu3YeRComYzbSeRFGwC58ohGwJ6xPWke2gwp82+8TeZkid1/2njJ0Sfg Udg76V2wvYoA6PaD8DBh5dKiWyWAWp0KJGKkQ= 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=RSP5eqkQNwptuq4lPD33K39JzkY2J7sMdSmKB/i3gy0=; b=l5xbFXVmGedvnOAUXwAhlu3r3wfmDfn5EeXWZM+2OUPWwCMp83VwaIy/d2fKdWY4Mf RdZ0fo8X1Ee9CKhM0v5SRfEGiyOUoSQIns8nOSEiub2RmVhtGaRfulvgEpbpjYacf7eK wuMLvgHpNjWLKCczgjzKBk+DYD1+II+ohIO0rucFIchBWgZfeRJ4MaepEOmfFRFHRuef aLIIu0XGtDr9PJ6LSVv1WrRzgiDC7/btDgiP0QXIrB9vkCuCK+g/8NdH4pLEqFMyKMXH RXG97NXOAgxBdg2GroyRJr8IQhGMQCy8Wp9blQondS/Cmwte5T/NAB9hXwZTrgVrrhtp 5jag== X-Gm-Message-State: APt69E057yl1G+XDrnltgwt/EwMgU3wEHrCIJI9G7h29n8vM/b9iW/Wb 0cyZEtDewIL6w+NhhR89aO0TJw== X-Received: by 2002:a1c:3ac6:: with SMTP id h189-v6mr9424543wma.64.1529327233298; Mon, 18 Jun 2018 06:07:13 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o12-v6sm30214854wrf.30.2018.06.18.06.07.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 77B0A3E0634; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:04 +0100 Message-Id: <20180618130709.19730-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-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:400c:c09::243 Subject: [Qemu-devel] [PATCH v1 3/8] docker: allow "cc" command to run in user context X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Fam Zheng Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/docker.py | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 663dfcba4b..c83fd89985 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -418,6 +418,8 @@ 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""") @@ -431,6 +433,8 @@ 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) From patchwork Mon Jun 18 13:07:05 2018 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: 138932 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3935971lji; Mon, 18 Jun 2018 06:10:32 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLL+xZrey96Y4viSousQuHT0+nc378CYSNfAyfuFc68Bk8H4LfoYOXRenb8inQ8nn9IVfiD X-Received: by 2002:ac8:26f7:: with SMTP id 52-v6mr10830349qtp.393.1529327432140; Mon, 18 Jun 2018 06:10:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327432; cv=none; d=google.com; s=arc-20160816; b=GH6+IJQG6dJP6siUumwuEcrV7cVUhOUwBMFrDZoLo/zUlsHwUqj40+yzvmiyDPbaXq zIGa4nPMrFgMt71Gs5ok0PkwosUuBTkpC3JwKy+6azFpYRV0dTRaiWL2A96nZOkJjL30 QQyzQ1Q2UduvzcVLcoGIEXZ1BOSfVoCVZNd5ihqkuAQkSJK9qQpsP7WVY4n0l4BbECyO YRTWxY7N1uNBw1gx9oLF3UgcooSLQK792d0REderbxnVcSwhxgYmT9TBUisxr3IfCRZh nXjTk3pFHt5AH9oFMBRgP0hJW+ae+CaR61098bTob3BWXiR7dandPzQOs8zp9ca7oQnk KEXQ== 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:arc-authentication-results; bh=mQkbtycqgecvtKajhSQdJnVmb+umLT7Ikvt2yrGdEKw=; b=LTGpoxS3wrYaSQCKGJM+nkeKljcLuJPnENZMVvlZa9U/3W2A3iRYtNFQcJbR1/QE8Y RwHblTWQaOG5hANZg3dMOsxcawq4Z0MPtkV9pRyw82GjHCoRwKfsQsqxzTidVBuT77zH G5U7VtikV2ANl8AFiGOM37B1sbceyQjrSsPsSW3uwd2XptxQ98OYlaGNmp5u9O/OT2xS P5UkFt80s4KfyaGmryjuGjGzsywsyAwHa3VDcWqmYr9mI9aCHZ9Cndt1pqOwA4WWBQfH zim1i4v6zkoziDl+yJlntQPqbmZFDuYpUjM1jhQwPIOaglr4eglYEKjmZJr955mzTrBX lVfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="arRpnv/C"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i5-v6si2875780qtc.150.2018.06.18.06.10.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:10:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="arRpnv/C"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:34724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtvT-0008O4-Gi for patch@linaro.org; Mon, 18 Jun 2018 09:10:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsK-0005y5-Kn for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsJ-0002eD-GW for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:16 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:35107) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsJ-0002dt-9D for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:15 -0400 Received: by mail-wr0-x230.google.com with SMTP id l10-v6so16790189wrn.2 for ; Mon, 18 Jun 2018 06:07:15 -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=mQkbtycqgecvtKajhSQdJnVmb+umLT7Ikvt2yrGdEKw=; b=arRpnv/CE6N6xQpwn/Pvym1fpQwYj0GapU3vNlv7m1LJr+HzU0yqlV+fUlHA85jO7h sR5NOBk0bZMe1BakZYZewcrPoLf7ckG15bdcIz8tkD7puDLniyMJE9zQ2IDtQI4IlfHc qrnQSgbQioNrqH9x+rmYfDrpc64FErwm+HO8k= 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=mQkbtycqgecvtKajhSQdJnVmb+umLT7Ikvt2yrGdEKw=; b=XkWP5j6KWw952oGazjHiefrbTp0vtDa00gp33QUrVSijUFRWTqY/jikt+mYusZCoA4 pRXquN4sRenoXWJorJUBrW2O09+mSQIPGMXx0rws0oyuxLntgwxS33L1m3qgE3rYEky7 bdxvh9ui5+O63yR/d/MAASqr6YEdzi6nTqHqC1jQLijokT1P/rwnStK9gwQsMmoc4HvI PYoOPwvEHVBKC2bt+ggQBmo+3rvb6ApWrkWxS0BhFdQX4r6fzwsJKW+RoEGgi70pX5z3 pJ2cEt/ba9mGvpT7/R+Xn1d7+RNkI0c9q+CgVbO3SMPpSI0KDkzgEG2IEE40G+/KKYZZ 2bjg== X-Gm-Message-State: APt69E0Rw0Yiqpi5czlvfceD1SIJV+txBdltThuvKWFjoLZdTlvivYPB SEnp+zA5x0bayiNVUC4lOTLB8g== X-Received: by 2002:adf:a581:: with SMTP id g1-v6mr10874863wrc.233.1529327234247; Mon, 18 Jun 2018 06:07:14 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j131-v6sm8835745wmb.35.2018.06.18.06.07.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8FA053E063A; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:05 +0100 Message-Id: <20180618130709.19730-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-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:400c:c0c::230 Subject: [Qemu-devel] [PATCH v1 4/8] docker: Makefile.include introduce DOCKER_SCRIPT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Define this in one place to make it easy to re-use. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 74fd51c22c..8afb383478 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -15,6 +15,8 @@ DOCKER_TESTS := $(notdir $(shell \ DOCKER_TOOLS := travis +DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py + TESTS ?= % IMAGES ?= % @@ -38,7 +40,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1 ; \ fi $(call quiet-command,\ - $(SRC_PATH)/tests/docker/docker.py build qemu:$* $< \ + $(DOCKER_SCRIPT) build qemu:$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ @@ -133,11 +135,11 @@ docker-run: docker-qemu-src fi $(if $(EXECUTABLE), \ $(call quiet-command, \ - $(SRC_PATH)/tests/docker/docker.py update \ + $(DOCKER_SCRIPT) update \ $(IMAGE) $(EXECUTABLE), \ " COPYING $(EXECUTABLE) to $(IMAGE)")) $(call quiet-command, \ - $(SRC_PATH)/tests/docker/docker.py run \ + $(DOCKER_SCRIPT) run \ $(if $(NOUSER),,-u $(shell id -u)) \ --security-opt seccomp=unconfined \ $(if $V,,--rm) \ @@ -167,4 +169,4 @@ docker-run-%: @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) docker-clean: - $(call quiet-command, $(SRC_PATH)/tests/docker/docker.py clean) + $(call quiet-command, $(DOCKER_SCRIPT) clean) From patchwork Mon Jun 18 13:07:06 2018 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: 138931 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3935501lji; Mon, 18 Jun 2018 06:10:06 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKxZmRkFWthC2IYpUZlum2tiBeXibR8OcfSEtYisAfUNzYZDrUd6QT15QQ0dsjyqeUPQdfE X-Received: by 2002:a37:9dd4:: with SMTP id g203-v6mr10098503qke.197.1529327406822; Mon, 18 Jun 2018 06:10:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327406; cv=none; d=google.com; s=arc-20160816; b=GheQM7nJZnIWoa5N3XJPsT1wXKUHJQnPk+AoZ++etcaSWP7ey+CeKLbRRuSI/nt2aL IwtTsfusAgMpneFdZdFW+ptDXMraOmw0yJBvdj5z5Z6Tu1oiPfyKj6SyQsgXLV2p2LUN RgSbn0gvXQfzfOOUAAS2qfOctc5tmskxy7984AmpkrFeXP14NRY1N+FXyVlTbYSZ1kq9 ZwxqVbUcDoLrjshx+QkhpvA+26ELHnLd/tnlPs9jJQYIdGTMGJnpFMaIfVv2VmxmpKAM Olq8YC6UefglVoAKxtmxyuxN0uPStYz3D8qFz1QHG+rpSNzjW4TRqvepRKCqEF4sklFv GJ0A== 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:arc-authentication-results; bh=ecz+Ilq7CZkxnIqJjCPOjfRhEywCxFiSW4xntMf1J8Q=; b=w2fQi2cLd2O8jwvMTrBXvmA2VMrS+pHPvmwRE/TSJGpXqPGqle6aaNaZWULaSlqGOf MRIz46r9A3zgyNs1g0bIh+nHEOulIf6EPp9f2aPKEus9+01wz7IeIfsfg56tm3ZG2Bb5 wOeQGDxubSQWjyHu5dj9E6pIp7vuRhHZ/n0p/dvl9c6spkOVI0MersNGNDV2/Ns2gXN3 9K3cMUEhp/FtsXUC58onI0/KayvDOaKMY7qV+Qwnu3GMQ+Qvr22cXP3HaZqCWJ6dU8bB pmxNbMSL6T84fe5tAoUjvFUuJtLXtAWjmZcSM2/g+SiK4zC30LdZZjDjURGijtcFfzHh l3LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iwK0cRf6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 135-v6si5280316qkj.115.2018.06.18.06.10.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:10:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iwK0cRf6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:34721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtv4-0008KQ-69 for patch@linaro.org; Mon, 18 Jun 2018 09:10:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsM-0005yF-Ns for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsL-0002fM-G1 for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:18 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:51656) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsL-0002er-8D for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:17 -0400 Received: by mail-wm0-x244.google.com with SMTP id r15-v6so13954626wmc.1 for ; Mon, 18 Jun 2018 06:07:17 -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=ecz+Ilq7CZkxnIqJjCPOjfRhEywCxFiSW4xntMf1J8Q=; b=iwK0cRf6gnW/q3PDSIfYHuaNOBaP3WGyYwQj25AISzv3uTfOEeMnkkxLltnRm5ByOP bmiW+8/f4ACi2uLKRG8TwzwgXtG9A6TvI9Kz+H//k/tSWKNwJMSZ5j+5RoPyclaajVRx I/ddG3gMMuMxu3VZQn1dob6pgb4TsixPOm6dU= 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=ecz+Ilq7CZkxnIqJjCPOjfRhEywCxFiSW4xntMf1J8Q=; b=mZsv4UCAWCEihLOvQAECaJOrrC2TSOs9N4UawV3y3rrnSS/4NDPcuyirNGR9LQW2Yd 5UzN9GBfKtvx+/6/XTJoK9/seAb1S+8Idjtbr+6DuEvJwzm5UqMa65qudop5nOXMskbn 4LQN13UdNaG1pezXSKI564NIBNDsNTkuPNYK4lzhvHH9hbWo5fwIEPaGgJJIRXUBYAbU ZDwJAAgBSjPCYfsQt7ytlQMlwRHUsGuZM2E66E058QGDR7zLhkUcDG5O/fyFVYIof8KP AZJI76HZB3sv2RYKsrH67YRKoouMjqyP1LwC2eGtpdrEaKnMjDfIF/jFSLJ6QPYbr4NF VJxg== X-Gm-Message-State: APt69E1mi7tPie0d1Mu4pw7F8zDuGr699WJsjYKxwyV1HXWfoGTJG2yw MD1Sr025dg7Qvw5Ni7Pl2Dvkvg== X-Received: by 2002:a1c:8312:: with SMTP id f18-v6mr9029299wmd.127.1529327236178; Mon, 18 Jun 2018 06:07:16 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z5-v6sm12504775wrh.10.2018.06.18.06.07.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:14 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A76593E063B; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:06 +0100 Message-Id: <20180618130709.19730-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-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:400c:c09::244 Subject: [Qemu-devel] [PATCH v1 5/8] docker: docker.py use "ps" to probe usage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The "images" command is a fairly heavyweight command to run as it involves searching the whole docker file-system inventory. On a machine with a lot of images this makes start-up fairly expensive. Signed-off-by: Alex Bennée --- tests/docker/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/docker.py b/tests/docker/docker.py index c83fd89985..3072bf4a31 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -49,7 +49,7 @@ def _guess_docker_command(): commands = [["docker"], ["sudo", "-n", "docker"]] for cmd in commands: try: - if subprocess.call(cmd + ["images"], + if subprocess.call(cmd + ["ps"], stdout=DEVNULL, stderr=DEVNULL) == 0: return cmd except OSError: From patchwork Mon Jun 18 13:07:07 2018 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: 138930 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3933104lji; Mon, 18 Jun 2018 06:07:53 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLeQnNvkJdPoyGtvFaoVx/CeVEcNfOtoTp0+jkX4+BSj93sja/PubIJn04ZSvkZVEyLCZQs X-Received: by 2002:aed:32e7:: with SMTP id z94-v6mr11107165qtd.70.1529327273103; Mon, 18 Jun 2018 06:07:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327273; cv=none; d=google.com; s=arc-20160816; b=xXzHgc19SqfF+yK85wwFFHQF3KcxevLAcfalpAe3Gf2vkW3rB9kr+rS+W1LOk+IUng i/zdSlLU3b8jpqKyOhGGnsefu/NEjtJA4yZUF3oyNXmvbLrPiW9oCKLGko3ZPjpRUxSz GgtndtMdRF7vr2cPPOwfw3R69DfRoW7ABNzhaJ61qdDE9vT0kb+8U5IzYeJ0XpTWJC4C sOImKvhQEQesFaQoeIkAU49ZAP9xDSsOHcZSAhICjK0DaaKzu5UxEQ3/pVWErKDzAqll hq88YYklGTf4S3ubjkHLusJTBfjEfu4giHJ8Qj2k3iNRUDf663wPRZ03LuE1jDdVPh8D UIcg== 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:arc-authentication-results; bh=4TCZ8aCcNLfGwTb8WsQD6FCOsSdhYeJliOZmFHb1vww=; b=apzUWIWqA1KGXrdLsh/uGKfr51+uawtZVdeCV96e/UFoYCF1Vl/b5YZyoTDF4+mXCK ZMZZSuxrVUdylb1iyOc+43ys/0OeK1GRj0cfQYcXtGSbng1QVntMtdlFd7DOz5+UjxF4 uu7iFcY+4QSuGVXKCpNocE7tMeDPAddzCJMJV5ZFr/uLVW3PpYDk6dkTA1sFrNqasz3p SDcFX/feINRo/1LIq4Oz5albvPjPsDQAwqhZyaEbxsf5lE0dqyz2chamPtH8NonmVFuX 7AwXbYmTIFXVZquWQSImc0JTF1YOFDFnAGQrGkX8nuCth7hKkajbKPaRkSroqEC8yWdA iF4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gL3YaT1f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s134-v6si4459149qke.92.2018.06.18.06.07.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:07:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gL3YaT1f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:34712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsu-00065i-Ej for patch@linaro.org; Mon, 18 Jun 2018 09:07:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsP-0005zT-Bl for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsK-0002et-LQ for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:21 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:43694) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsK-0002eW-E8 for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:16 -0400 Received: by mail-wr0-x242.google.com with SMTP id d2-v6so16751794wrm.10 for ; Mon, 18 Jun 2018 06:07:16 -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=4TCZ8aCcNLfGwTb8WsQD6FCOsSdhYeJliOZmFHb1vww=; b=gL3YaT1fLkkPfUX7cJuQBQv5P6+xwGTm3MiHMy8sOH46+jLcFDyjYvXUjOto7SDliK 9/sjcnkmAK5AVqBc+N7CQHW5nFPtddToQFcCuknyX4eQcUA1HL+ghzS1A26JIrj2c9v6 qSXfcVDC/of6aC6OvyH5BMHqqsVfrWy/kHCYQ= 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=4TCZ8aCcNLfGwTb8WsQD6FCOsSdhYeJliOZmFHb1vww=; b=ucZqzQICO1wMtqkqJd0FomCfyVRSnnx8x+k8g85phICb/K2ra+BaiYAWDykJ9+fqVU Z942dNEaQMyfHSI5XKcda61YGl1aENsq4SsyTlzFHvi68qMfdur+ZRJfkQZWH356AK2I S+WjrpecAGd4fHmVRf1v9Pqth3LVarucj/HgtSiALAP62lXkfG1WZVyefBlCH/g9pvA0 XudMNi2HNxXig3fItXn6dxQdAaAFV+SAfyFHhVxxSFI+0JbMKmPDwdw9gzFPTUry+Q6h C0p+BZohpMUNbxe2s5mODvRBpnNDPvupYkVhzyP3icEyQPP3f8MLBIPUPDSkV3QVxVW4 2J+Q== X-Gm-Message-State: APt69E0/RVPejgApYTzFgkddpZUGA9ddI7Ry1YqfCMRipGS4610UI5CO Y7h5VlHJmYNyfomzvjzz4vbArQ== X-Received: by 2002:adf:9187:: with SMTP id 7-v6mr11083401wri.69.1529327235497; Mon, 18 Jun 2018 06:07:15 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q14-v6sm120849wmd.20.2018.06.18.06.07.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:14 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BCAB53E064A; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:07 +0100 Message-Id: <20180618130709.19730-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-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:400c:c0c::242 Subject: [Qemu-devel] [PATCH v1 6/8] docker: docker.py don't conflate checksums for extra_files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This just gets confusing especially as the helper function doesn't even take into account any extra files (or the executable). Currently the actual check just ignores them and also passes the result through _dockerfile_preprocess so we fix that too. Signed-off-by: Alex Bennée --- tests/docker/docker.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 3072bf4a31..325915a6f9 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -201,8 +201,10 @@ class Docker(object): tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % - _text_checksum("\n".join([dockerfile] + - extra_files_cksum))) + _text_checksum(_dockerfile_preprocess(dockerfile))) + for f, c in extra_files_cksum: + tmp_df.write("LABEL com.qemu.%s-checksum=%s" % (f, c)) + tmp_df.flush() self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + \ @@ -317,7 +319,7 @@ class BuildCommand(SubCommand): _copy_binary_with_libs(args.include_executable, docker_dir) for filename in args.extra_files or []: _copy_with_mkdir(filename, docker_dir) - cksum += [_file_checksum(filename)] + cksum += [(filename, _file_checksum(filename))] argv += ["--build-arg=" + k.lower() + "=" + v for k, v in os.environ.iteritems() From patchwork Mon Jun 18 13:07:08 2018 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: 138936 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3939958lji; Mon, 18 Jun 2018 06:14:12 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIDXgXI9bpY7W2gmXguG0EB4Kdtxl4dfwM827A96q2zXlcOWF6IV0oGri/34eL51jFvS0Hm X-Received: by 2002:ac8:94b:: with SMTP id z11-v6mr10977744qth.340.1529327643383; Mon, 18 Jun 2018 06:14:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327643; cv=none; d=google.com; s=arc-20160816; b=Fg8YHnDfLZ8n0tN9/NibR2sWIavPB9Gc34COwWYgipQCDD5iJLEOLvYVjqMki6kT8I UGUW2Xb1f4PuAz8erlTuVwBUBj61ahd8EVlYO78ROek/E6tdcaXPSjZq5TFPSYUz7kpj I4cLMBIKO/dvFlFS0pi4NQWk5WY3Ot7JhgrViZnlLGUnthyir5q7YbF6aP2y3GdKBD4F ibHh1ebKKFD8NUtF38WHStSF4MVh+j88nLH7F4sIY6d/sWVCSzGXNP3oPWCVjfLM5x1q MzFc4ubQG8EXCP0GsVXhnNS1wmh7nFDSu/4dkFM4DugksC6h25kifh7wn1nJBv7RJJqh P2bw== 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:arc-authentication-results; bh=RTAVjkJnifp60KE2wcnTtu+icpE6wvJBzFNFLwcUhtY=; b=ZnXcrWgslCoLJEwWkGpHg8W0K8+tHYTT975SJYTUL1TDAqOMJztWxK3ZC/hipSx55B D8tr20xzKxKZrBpmaHBM2E6rL5XmlaOi4+46CV3gnfn60rXfeb4eAmEZJiF3bG1CbnkF cBC1jDBkW+c6WnBJRq0AVPU5pEZwUqQNhs5l68qFj461JW4vrGh68NVNulqd4vNq9U7J r6y11g65X2TCusIFAUC0JA36iU+BGQ6gIRZyn6GIpNjl2MUmrUuQB7IxheUklVxm6qy8 SzzHutPVgq3aoB8aXFu6kwJ2ZDVtMC0Es9Zu/iljE9SiX57VSP3gr49av6Vqjiu32PW+ byCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b6svZQ0d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i49-v6si1921361qvi.207.2018.06.18.06.14.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:14:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b6svZQ0d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:34741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtys-0002wI-S3 for patch@linaro.org; Mon, 18 Jun 2018 09:14:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsO-0005yi-9N for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsN-0002gE-Co for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:20 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:37870) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsN-0002fl-4Z for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:19 -0400 Received: by mail-wr0-x22a.google.com with SMTP id d8-v6so16781852wro.4 for ; Mon, 18 Jun 2018 06:07:19 -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=RTAVjkJnifp60KE2wcnTtu+icpE6wvJBzFNFLwcUhtY=; b=b6svZQ0dj5wXGhmspS+IMhmUl7yB3xlT8O5zRDFcNVrMReYVGUhEEWsesMBQbgGQSO SuT/YVgHvjosxYeQUW1mP9K7/dEaKVWIgOwoqUGVqThWliDwtcxuw2yiuaRLesofze+T UXuy0Hx2WZ/wViiYBxxXyjAYsza1qXqv9I6DE= 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=RTAVjkJnifp60KE2wcnTtu+icpE6wvJBzFNFLwcUhtY=; b=hXWDA7fx8Qmxioi+cFZJAg5xz8bUuartjZIu9rctY1bEjOxPmBdlcbVt9BZgSqII1w aTjBKof6P9oLiD1s/kD36umLhFqDZoQpxfZpXA5T9QaB1qAL6agM0WymKycShp9VUsSr EdNc9nbsuMEmusjCKpT8KT8AaJvbjVI0vxtS3UbJKuR/fx2G+monurBrn8xr4DM3QjfB J9PwPg69PDoTvC2WuIzI208I4Cuq0BX4cuqaHZo0RxFlEg4gvhAfZhGLtM1PGvs7cd2t D1K3i4JtSWnNGjlKaE817cfTWsLIdVp8UmD/w1bK1gJVIfbRxHqv9sNsLgUHyFuIUKEQ 00dw== X-Gm-Message-State: APt69E3qvYcak/HjQZ8D+tgF8od7XzCXyHzYC/ztznT63ydiPW/AYAUK QCiDqHl8nvkT2RjMF/54ibiPjg== X-Received: by 2002:adf:ac37:: with SMTP id v52-v6mr10624484wrc.56.1529327238129; Mon, 18 Jun 2018 06:07:18 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p38-v6sm34036243wrc.11.2018.06.18.06.07.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:14 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D2F603E072F; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:08 +0100 Message-Id: <20180618130709.19730-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-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:400c:c0c::22a Subject: [Qemu-devel] [PATCH v1 7/8] docker: docker.py add check sub-command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This command allows you to check if we need to re-build a docker image. If the image isn't in the repository or the checksums don't match then we return false and some text (for processing in makefiles). Signed-off-by: Alex Bennée --- - fix prints to be "modern" - PEP8 fixes - split inspect into function --- tests/docker/docker.py | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 325915a6f9..c157ff826a 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -179,8 +179,14 @@ class Docker(object): stderr=subprocess.STDOUT, **kwargs) + def inspect_tag(self, tag): + try: + return self._output(["inspect", tag]) + except subprocess.CalledProcessError: + return None + def get_image_dockerfile_checksum(self, tag): - resp = self._output(["inspect", tag]) + resp = self.inspect_tag(tag) labels = json.loads(resp)[0]["Config"].get("Labels", {}) return labels.get("com.qemu.dockerfile-checksum", "") @@ -442,6 +448,36 @@ class CcCommand(SubCommand): return Docker().command("run", cmd, args.quiet) +class CheckCommand(SubCommand): + """Check if we need to re-build a docker image out of a dockerfile. + Arguments: """ + name = "check" + + def args(self, parser): + parser.add_argument("tag", + help="Image Tag") + parser.add_argument("dockerfile", + help="Dockerfile name") + + def run(self, args, argv): + dockerfile = open(args.dockerfile, "rb").read() + tag = args.tag + + dkr = Docker() + info = dkr.inspect_tag(tag) + if info is None: + print("Image does not exist") + return 1 + + if dkr.image_matches_dockerfile(tag, dockerfile): + if not args.quiet: + print("Image is up to date") + return 0 + else: + print("Image needs updating") + return 1 + + def main(): parser = argparse.ArgumentParser(description="A Docker helper", usage="%s ..." % os.path.basename(sys.argv[0])) From patchwork Mon Jun 18 13:07:09 2018 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: 138935 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3938431lji; Mon, 18 Jun 2018 06:12:43 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLUHWu7RNqGoK+G7Gwn2bIipxLjbCvm/IJKaLeNOuEShGkQvKSB4pqPwzoBLkeZtihohKao X-Received: by 2002:a37:129d:: with SMTP id 29-v6mr9977631qks.263.1529327563788; Mon, 18 Jun 2018 06:12:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327563; cv=none; d=google.com; s=arc-20160816; b=m2vdoCRbHIjuSzrNFrML2fbzSWyUTp40JL0XDPCToVTY7LLF7nhg5XOzk3W9SfLcG7 x03oOGoBOFqqHfVGtbYHsx06vEUwyCLy9IEi9lrnLW178V4RoSNfGZ/pb7NZd3tGDho7 UaJ8P3v31ZgSPfC2KA7gEjElS/hAH+qDqb0b+B6xCFO2WLOTKU98zZVyBL0k8uxyu/Bn Zlco/MLqRA5FZHzuYc9GnPRv1mPXpwrxyDutL/EyK6lJwKyP7dot4FisS+HZFyi1Pvjs Ki0PbkD2pLk+RrOB0jRF93ddAQPHR5Eni1s2NB3Jd7QWijc35HBlUGEwsD/1G+eOIHTW Z05A== 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:arc-authentication-results; bh=Drk7yosOJoszpUb8YawNCIAsnE+MnRqM7ImKUYir8Cc=; b=eTbXDOkJ4e8ycjAm8gCCk74zOmcLNgS6MJ5z7yL4piF7kbCcicSzNUgrCOyGIFeymc lAyc/z/VF4oUnlsT6KHHRt0Kdpc2yOnRe/soTbwq3XuB/+QX6aQ5XlgiPX8ZgAG/r2wQ /7bO0zHNszoy1HIg0TlnttKXY9yjXqdTv0Yv82pbTryqlM/RhvGOez+RvfYui7s337lj 01nTOk9XpRoIRCqC/kAIoZX8Y2jqre0o6jM2Gwu45PFIN34eZayV48NdGTZUtfVsyk3Y 9ipAOkKmXkQXldQrtQiX3OEArMMLPZ1ggLubpnOOEBiFE9ELeL8pUgfRXk7MjrntBAlu hg/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OEp5HDc4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a64-v6si13376103qkd.158.2018.06.18.06.12.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:12:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OEp5HDc4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:34737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtxb-0001n7-8q for patch@linaro.org; Mon, 18 Jun 2018 09:12:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsN-0005yM-O2 for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsM-0002fq-Ik for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:19 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:37881) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsM-0002fV-Bk for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:18 -0400 Received: by mail-wr0-x236.google.com with SMTP id d8-v6so16781794wro.4 for ; Mon, 18 Jun 2018 06:07:18 -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=Drk7yosOJoszpUb8YawNCIAsnE+MnRqM7ImKUYir8Cc=; b=OEp5HDc4dEsf6NYqXC5lCRjqihh0OTTcHgDDYIuFAh/K0VcejbTjF1m/Ibgzd/YLM5 drY1Qf5SlupmdTD/RkSrOSLKTVxDTQWxNw6SP77ZMOq3slCWuZou3R7Mws/tJ0B8gwml 5+lOW0rPHLeuhywIXDtIjgZAV4KClXpmK52yI= 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=Drk7yosOJoszpUb8YawNCIAsnE+MnRqM7ImKUYir8Cc=; b=RFAM6sZyqpTB4noQj29TDaGypgOx4FGMSqdqxb21j5yswLdmvcfYJd2lbMIsa0m4Fi r00WDOD0+VgBy+QWAMNpKZuhdp40sjzteCLA9/kFrsRyyVSgB0RvZzTLh8zKnWzqd9e3 Y+rE2f6j2fivt5lJHvPY27PhfTKdf6oq3gQw2pbpQHMc1RG3MWweskxl+449c66EB1ui ZA2/BNrSujpMVBQ7hjUII385sOMkE8Mi6biHWMrcQ0MMOVCJIeDwjtp1NRxvaoGR1A4v QZve6CT6pJI9xZ8DXgwXi8R8JX70vGtdFlP4batwVDM9AlbwNRfWsZJhXnNiBvL1Vau/ CAaw== X-Gm-Message-State: APt69E0tbDRjoos0c9gd6T8WNj/JszweOjp9Nh0aCKHUVex481LCbkDT E6QRU2xfJxhTZVM1Yhra61w8ZQ== X-Received: by 2002:adf:f18b:: with SMTP id h11-v6mr11031036wro.214.1529327237315; Mon, 18 Jun 2018 06:07:17 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b80-v6sm9119626wmf.2.2018.06.18.06.07.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:14 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E70283E0768; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:09 +0100 Message-Id: <20180618130709.19730-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-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:400c:c0c::236 Subject: [Qemu-devel] [PATCH v1 8/8] docker: docker.py adding age check command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is useful for querying if an image is too old. Signed-off-by: Alex Bennée --- v7 - use cached info --- tests/docker/docker.py | 46 +++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 10 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/docker.py b/tests/docker/docker.py index c157ff826a..da1ed4e879 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -29,6 +29,7 @@ from tarfile import TarFile, TarInfo from StringIO import StringIO from shutil import copy, rmtree from pwd import getpwuid +from datetime import datetime,timedelta FILTERED_ENV_NAMES = ['ftp_proxy', 'http_proxy', 'https_proxy'] @@ -185,6 +186,9 @@ class Docker(object): except subprocess.CalledProcessError: return None + def get_image_creation_time(self, info): + return json.loads(info)[0]["Created"] + def get_image_dockerfile_checksum(self, tag): resp = self.inspect_tag(tag) labels = json.loads(resp)[0]["Config"].get("Labels", {}) @@ -456,11 +460,14 @@ class CheckCommand(SubCommand): def args(self, parser): parser.add_argument("tag", help="Image Tag") - parser.add_argument("dockerfile", - help="Dockerfile name") + parser.add_argument("dockerfile", default=None, + help="Dockerfile name", nargs='?') + parser.add_argument("--checktype", choices=["checksum", "age"], + default="checksum", help="check type") + parser.add_argument("--olderthan", default=60, type=int, + help="number of minutes") def run(self, args, argv): - dockerfile = open(args.dockerfile, "rb").read() tag = args.tag dkr = Docker() @@ -469,13 +476,32 @@ class CheckCommand(SubCommand): print("Image does not exist") return 1 - if dkr.image_matches_dockerfile(tag, dockerfile): - if not args.quiet: - print("Image is up to date") - return 0 - else: - print("Image needs updating") - return 1 + if args.checktype == "checksum": + if not args.dockerfile: + print("Need a dockerfile for tag:%s" % (tag)) + return 1 + + dockerfile = open(args.dockerfile, "rb").read() + + if dkr.image_matches_dockerfile(tag, dockerfile): + if not args.quiet: + print("Image is up to date") + return 0 + else: + print("Image needs updating") + return 1 + elif args.checktype == "age": + timestr = dkr.get_image_creation_time(info).split(".")[0] + created = datetime.strptime(timestr, "%Y-%m-%dT%H:%M:%S") + past = datetime.now() - timedelta(minutes=args.olderthan) + if created < past: + print ("Image created @ %s more than %d minutes old" % + (timestr, args.olderthan)) + return 1 + else: + if not args.quiet: + print ("Image less than %d minutes old" % (args.olderthan)) + return 0 def main():