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()