From nobody Wed Feb 11 05:53:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529327368324273.742368863096; Mon, 18 Jun 2018 06:09:28 -0700 (PDT) Received: from localhost ([::1]:34716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtuR-0007Eh-5R for importer@patchew.org; Mon, 18 Jun 2018 09:09:27 -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) 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) 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-Google-Smtp-Source: ADUXVKLszgKjAirA52724PJIs4lHvGms27p173M5CaJ9Ce4RO1W+3JO8ACvw4K41GaF5CVzIvjqZsw== X-Received: by 2002:adf:9187:: with SMTP id 7-v6mr11083401wri.69.1529327235497; Mon, 18 Jun 2018 06:07:15 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/docker.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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): =20 tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=3D%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=3D%s" % (f, c)) + tmp_df.flush() =20 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 +=3D [_file_checksum(filename)] + cksum +=3D [(filename, _file_checksum(filename))] =20 argv +=3D ["--build-arg=3D" + k.lower() + "=3D" + v for k, v in os.environ.iteritems() --=20 2.17.1