From patchwork Fri Sep 8 09:54:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 112057 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp52557qgf; Fri, 8 Sep 2017 02:59:49 -0700 (PDT) X-Google-Smtp-Source: AOwi7QB4Bl9n3mUR4L00n7xo1xyl03FwX8Br7RKrAbuES1wf6eHGGICGrT9DAbuX1PR2ZaKnKEtt X-Received: by 10.237.49.100 with SMTP id 91mr2965647qtg.279.1504864789567; Fri, 08 Sep 2017 02:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504864789; cv=none; d=google.com; s=arc-20160816; b=HRSrt4AA5WW/xD5OZ1R1VkHcBKliuqaqcqzoG2BE3Nt+K3xoyoUuskfwqg/CAVHsKJ rypJyadCVm8PAZiafbAYdTtfOaZK5Znhg9OpKhJIVsXs/ZOFP2HcVbdDs6GCD6uCOrGX +a8uq3lt8BGQZaH44og+57gWx4TEghz0wkNMevLRWQdQWCrodoDa8WkR2kfsZ81J5bVy kb2DyS65vU4U4oxsRLH7MJFwcjfVub7Es6oYLc5SNdfNBeM2q5O5SGTEBp7HzrrkAE4o 6bDI8uWYeQpveOsd7BIrwj3icLVbyS4gWLuQGZ5X8N5Mp3oN77UNC93wG/07wKmp+23v hjQg== 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:dmarc-filter:arc-authentication-results; bh=1498xm6MYMgIPLxq6whYu7HJzKqwnFX0VtkEE8ATQKk=; b=pTE+n7Re8n+dsq0Tp6P5Ool9JItCLNm8h2l4yBLufz90ASf3kp+6z8WVzgNVECJZVZ WfAqO6pDsaSY7c/BACU2b5KVg3U2PiWlk0gNd+j+oGPUQn1/oKFEjN0RJ3UsEknD+3Y2 JbsQ8DRhQCEChdOH8PuRyZvelVJXATF2Jaaem0czvNB3g/XI31g7KLkvdrkQ8YepgLvX IRqwNaSmGE0n2TZlQylozzyCnmPaBmORv9aUageN/Gurca9lZXPE4s9sr9p6OKGF9TST Q/qKE/DF5VXxRhMjvKTOmR1+dLHrX7fP/G67kDRPb7OflLE5op01Y3kuZ+33/cKyg3gj oeUw== ARC-Authentication-Results: i=1; mx.google.com; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p3si1702933qki.76.2017.09.08.02.59.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Sep 2017 02:59:49 -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; 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=redhat.com Received: from localhost ([::1]:44251 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqG4h-0002nB-Gn for patch@linaro.org; Fri, 08 Sep 2017 05:59:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqG0O-0007do-Cg for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:55:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqG0J-0004Fi-RI for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:55:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dqG0J-0004FD-Kt for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:55:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8D4D5C057FAD; Fri, 8 Sep 2017 09:55:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8D4D5C057FAD Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com Received: from lemon.redhat.com (ovpn-12-98.pek2.redhat.com [10.72.12.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48BC760E3B; Fri, 8 Sep 2017 09:55:13 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 8 Sep 2017 17:54:30 +0800 Message-Id: <20170908095506.13594-3-famz@redhat.com> In-Reply-To: <20170908095506.13594-1-famz@redhat.com> References: <20170908095506.13594-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 08 Sep 2017 09:55:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 02/38] docker: docker.py make --no-cache skip checksum test 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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée If you invoke with NOCACHE=1 we pass --no-cache in the argv to docker.py but may still not force a rebuild if the dockerfile checksum hasn't changed. By testing for its presence we can force builds without having to manually remove the docker image. Signed-off-by: Alex Bennée Message-Id: <20170725133425.436-5-alex.bennee@linaro.org> Signed-off-by: Fam Zheng --- tests/docker/docker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.13.5 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 81c87ee329..08122ca17d 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -263,7 +263,8 @@ class BuildCommand(SubCommand): tag = args.tag dkr = Docker() - if dkr.image_matches_dockerfile(tag, dockerfile): + if "--no-cache" not in argv and \ + dkr.image_matches_dockerfile(tag, dockerfile): if not args.quiet: print "Image is up to date." else: