From patchwork Sat Sep 9 05:45:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 112142 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1206797qgf; Fri, 8 Sep 2017 22:46:51 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCVDWxeBJnQK23wB+tYvdDHP1dvDw4mM2VlWsGw2XgKR0PLgUwFDkGCHdVtO+tzO318/lw8 X-Received: by 10.55.182.194 with SMTP id g185mr7363040qkf.127.1504936011169; Fri, 08 Sep 2017 22:46:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504936011; cv=none; d=google.com; s=arc-20160816; b=iBtc01CW79KsVCo07nnhjdS+IJEPjygjO9mldu1/Va49pFRah+wgSnuCET0o5MGpb0 WAKYVwx65ea8lNt9QgKM0/xBlkHKHkMRPA3YU7PJyiKZdLGQhgG+v9vm9C1sNJxL5vgK IvOmPpmmqyXvpVXTDwFuBwNoZ4ejaJwidtonSdIroR94U1fUH14tMuBQb9jwwujMpj9S I1b8WfcwBUIjBAvwVUPQL9qjJwBrnRNMZTWbFWLlqz3E8YqsGVhDMp9aeBQvpYOQkPt6 RbOIKR/hPbQwTzQiUVrxQoH83SiekNrMkSs5iyBNBdHxOCwFLahEPLTp7l/kzVmW0EWm Kk3A== 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=NUjwkNOSdUVIJb5vUVsPg+Kagg5tp3Dz4KbCasc4ZeMksjABTH550sF9bwWwU0ib/Q dGK+TKvUAUzXUbpdCnN4IB2j+qnEQwiEHT3QN4BtHFbhVlgP1JCf+gVUZLz1RX+5cDae 1g/jVC/Chd8JTPn+TLilg6Qq0uIyX5wt/JPeoyIcZ1kSzyiwaD7wzGUHJtdJlXbDshsx q37w40ySZP5U7hCQUmWED/cLcQYN1ebMpO+SrHgRteLyEM+lhXn8y/baLRxb/8deTZrd JOMQEWjdtHKExSnZx+AC86rpVodU07lquC23euZxo26a1F7t4m9YKoAt0ZDzJfZac50G q2yw== 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 g34si284341qtb.129.2017.09.08.22.46.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Sep 2017 22:46:51 -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]:48244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqYbR-0005lg-1C for patch@linaro.org; Sat, 09 Sep 2017 01:46:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqYb0-0005ka-AH for qemu-devel@nongnu.org; Sat, 09 Sep 2017 01:46:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqYaz-0006CI-LC for qemu-devel@nongnu.org; Sat, 09 Sep 2017 01:46:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56916) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dqYaz-0006BZ-FD for qemu-devel@nongnu.org; Sat, 09 Sep 2017 01:46:21 -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 7382483F40; Sat, 9 Sep 2017 05:46:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7382483F40 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com Received: from lemon.redhat.com (ovpn-12-40.pek2.redhat.com [10.72.12.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32C7560240; Sat, 9 Sep 2017 05:46:18 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Sat, 9 Sep 2017 13:45:38 +0800 Message-Id: <20170909054613.19148-3-famz@redhat.com> In-Reply-To: <20170909054613.19148-1-famz@redhat.com> References: <20170909054613.19148-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.27]); Sat, 09 Sep 2017 05:46:20 +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 v2 02/37] 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: