From patchwork Fri Jun 15 19:47: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: 138792 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1276126lji; Fri, 15 Jun 2018 13:18:37 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJQKcKZQU2i6dFuu0/5qVlx/39FeIYMWAEoehN4Z8jXHlWJrXtPDmplctiCdEOcvOUPqkSX X-Received: by 2002:a0c:b2ca:: with SMTP id d10-v6mr2803601qvf.16.1529093917514; Fri, 15 Jun 2018 13:18:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529093917; cv=none; d=google.com; s=arc-20160816; b=GG/laPl/aYzAkGgCJGVzqRVZMzEfxdgyerq4+qQhZQGUwVUbsQTm4iqj8W+7cMS/u8 1uMlsQBSHDVTdE5DgAHrtzaj5oqZ1KIcBdcVZPuKdd/f0nLgdpSj+MzhVvFFrqUEiqDz +rKr76Cyw4oiTmFl5/g1k+yRV11LASf9A9KtDTUyV0zOyj7mAqDyjOBP632Re6+xBJqj 020IL1q42cShRWVHlJoFAKksbQuB5gb3icq1YxRYmgOGtf2TYBMS5FFsW905rRrd6tyz dF8dUngbjSyh3KKLg0w507C4jYblkF+MC1NoVGpTMdgKSO5kEGgsbJVuKqVBgmW3uE9C ei7w== 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=Vua07p4/u4F7CHXsCSSR7SBJhY05ygQLrhUxMuJgSEo=; b=mvkK6Fq7nnpu+S2wdp1Pnp7Ixn6CztJ1Sg7VN4HOd4hDLY4cl61fIMJLc9mjYcE3kK FWhrg5DMGdgNUQk/1OT24XaPhGZKKEyYTFQmF6H949koZvvMBCSbvWPPr+BOMmXjjPgJ xnecQJIbsw62Yb+xYP1yUnywdGK74y5Y8m4qd9cooN18+sldAspO0sqriwluHuqt3+d5 wQUZqL7QbXbzeqYQ5oZ4he8pz+cphcrm0/QIbWKVEKXAf83WpbsSMBXA0C17zzILhd6Z MMfNVFNDCrq+T6Cyp0jcf/rXbxP6rLKvtrG0pa+qwkujlDtJmFha+2dg/ec1OXCmkz4c qAnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Vofw8+d9; 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 n89-v6si5820401qva.105.2018.06.15.13.18.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 13:18:37 -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=Vofw8+d9; 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]:49144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTvB7-00025O-0v for patch@linaro.org; Fri, 15 Jun 2018 16:18:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTuoi-0000ko-7Z for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTuod-0006oj-Jp for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:28 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:46517) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTuod-0006nb-6C for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:23 -0400 Received: by mail-wr0-x243.google.com with SMTP id v13-v6so10956921wrp.13 for ; Fri, 15 Jun 2018 12:55:22 -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=Vua07p4/u4F7CHXsCSSR7SBJhY05ygQLrhUxMuJgSEo=; b=Vofw8+d9WyfirmbVy5xE03II90Vfa00e039UMQP77zzqxFMN+KPuuRcK0VXNY6WVY5 Wl6eNt1LAJtEUY/eJ9OMjk9l2ANWe9Xpgr7VRR5qjmvWJUr+HVhi5sXNQmDIIXY54U6w aw4mojrAwLqFp6af0zSbVSo0JXHHWeop/cIJo= 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=Vua07p4/u4F7CHXsCSSR7SBJhY05ygQLrhUxMuJgSEo=; b=f7AcyxAUNTWSFJd9K04pfiFKUzS3nC8YW/KVlA/bHGdISiyXXgNUf5CVETOD9xiRAH zzV4pAHG/PJMTgU5n0mtkfcTpdleAlBCo/FABdu8zv48sa/pxU1CM0lsm9DtLvRM2lGz lM8/92r6HRjgW6H/u+4qUwQUjwvBK9rsv68u3EMFfzb1FUFqJnqzH2XmPaSFPljgG5a2 NaRNEKYBScz/CdAv10EBrsx2si3WODzsYv5m0i3IOdTcr4eLDpZoF4XfGYO5qdvRltz4 QXMovYhp6D+0Vh+U80Ls6RJcDb8FsLLJLU5Ey0xIk8kPkYs189/Dl4y+BLL+hvj43GJA FYRA== X-Gm-Message-State: APt69E1TzOfGF/3ywOi9Dm6hEGOB/bPCH/FJjC3H+MVokbU1VOHIIG75 RAQWRZGDkej6dITJD7u6ILdLvA== X-Received: by 2002:adf:eb0c:: with SMTP id s12-v6mr2928110wrn.174.1529092522084; Fri, 15 Jun 2018 12:55:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g11-v6sm9382817wrr.46.2018.06.15.12.55.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 12:55:16 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B32D73E101E; Fri, 15 Jun 2018 20:47:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:47:00 +0100 Message-Id: <20180615194705.28019-50-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-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::243 Subject: [Qemu-devel] [PATCH v7 49/54] 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 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index c83fd89985..2593a12d04 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()