From patchwork Thu Jun 21 06:26:00 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: 139459 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1678516lji; Wed, 20 Jun 2018 23:36:04 -0700 (PDT) X-Google-Smtp-Source: ADUXVKID6Ug4CWrNyJuESvhglaghY5NZQDAruwP6Gt+7k9CJEOiF+Ufa44x+zaXLS8ZREhCIMxZy X-Received: by 2002:ae9:dd06:: with SMTP id r6-v6mr20013959qkf.417.1529562964760; Wed, 20 Jun 2018 23:36:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529562964; cv=none; d=google.com; s=arc-20160816; b=ZOS1KDznQRvk5jP59LfYbmEwKe/jgbMAiMG/ge+51dw88F/nClPgmerKoWTZsjTxej 51hpUpSm/gJrCD+EzZEkR611Mtdo9uDowW84KbMJJznNaaJkXxvjbkCUeDnPhg8/26HK UAEqHqfGct22DoVaOtOLbxHj3Bhj1MWKhINwPGyMHLAujSx8Sw6n1Tqwk7sNzQn991BN hes9YtgjNH83TfMCUC1Aq2cCv+yr+x7Vj+Ghd/FgBfpc7zApwEvAD/amkRrg/79xv03g FcKYxWTmYKSANYoSkMtfOcl1rU04YqaneiYWRUxn5SMGEyLzbZA2ERk8P7Z6uKdNCZuI WKPw== 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=F6UTTcvzSadnIxpyUoEdQHuXtK4WMtNIOyrUPedwV4s=; b=mfWo9seHrigMCESx3Ox1/UhhF2MmstT9GgJMDeHvaNsQbPUpsKkqVeWXO10iIjwUir L+/U/kWhqrb/h8Dc96MKttXbpuzaVztMTdAv0V4gpDwhtBjKDFOex08scTlmVR0aPNCg 9wysA/ZeOZFAb/NUf7Tpvkpu4PbEri9J3MtdNdb40XRrGgVkOqvjGw9olqorAmqNMJRR l8zQMY36/61xrZU3rEEAGHXnrTHlBmG0nZKbvAmtD52lpQgpSr7NzWTRr/C4cULCNXOX L1M9OXItU1qZZWXZIvFOuDo1Kf8jf4jHiDEfs6BBZEgNydHKybDus4EcJ009reRtmXJB xe/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="U0e4/e2/"; 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 k58-v6si4168528qtf.137.2018.06.20.23.36.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Jun 2018 23:36:04 -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="U0e4/e2/"; 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]:53287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtCO-0008PU-71 for patch@linaro.org; Thu, 21 Jun 2018 02:36:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVt32-00015Q-Mx for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVt31-0000jv-RR for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:24 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33203) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVt31-0000jT-Kc for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:23 -0400 Received: by mail-wm0-x242.google.com with SMTP id z6-v6so1884783wma.0 for ; Wed, 20 Jun 2018 23:26:23 -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=F6UTTcvzSadnIxpyUoEdQHuXtK4WMtNIOyrUPedwV4s=; b=U0e4/e2/G1GIBsWnI+vfdsW6sFsrgpJHDyA0BXX5JoDIKVfSfC89EI48wSRfgBDarE jLV56WfyRXpv9Qg8iHw9muHmkNUknOsLt7lqMpghnHEhT+NeErd0eJpNLphdK95BidbX NDbQgCYGbICYst1sjwFlrkVGJZ5cU4WN6gv5o= 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=F6UTTcvzSadnIxpyUoEdQHuXtK4WMtNIOyrUPedwV4s=; b=DaqOlypR4OAGOvvk3ia5K9I3acUV/OJlASsHURsx0n16hxwe+JKy9DEvAGWRN2DslT X+t+lDLL6P/aLyeHTfOS5IhfRLVgfDbcHiaeIRNBEamweioF9G20uuBYfgUiUTOEYr9Z gkzWLohM83T+pI9M2daBjaRpaOh+G743TIwqzsX2ikrqRi5FP+iO73s20yL4UofDezXq FPNJ8LLlZbNcbBaYdGUuo2GLWnuR8TF724YCb7w/veVD+P/135IGLFiKneeZuqrMB3ld 2//70GwPz2rxywKQxKIsDvJ+WfPF6AhH8/q8nVR77+2tovNajCL5qtUILUek4CLL1+FI roqg== X-Gm-Message-State: APt69E0+oPkr0AZ2OfrLjnurfyRL6y2I8ed3Bwo5PFMk6nDJHJpHXPxd FNfNf5jkwpwhx9nyqdQW/IPWRg== X-Received: by 2002:a1c:88c9:: with SMTP id k192-v6mr4125961wmd.125.1529562382596; Wed, 20 Jun 2018 23:26:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d3-v6sm3851580wrr.90.2018.06.20.23.26.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:26:17 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BD21A3E150E; Thu, 21 Jun 2018 07:26:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:26:00 +0100 Message-Id: <20180621062605.941-53-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-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::242 Subject: [Qemu-devel] [PULL v2 52/57] 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net 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 Reviewed-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index e6437d64a7..6a9f2f224b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -206,8 +206,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 + \ @@ -322,7 +324,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()