From patchwork Fri Sep 22 07:46:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 113963 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp2792391edb; Fri, 22 Sep 2017 00:47:34 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAdpE4yWlwwrHsE1bwpZmZ1GyPoH8huNwuMhQdo8eQtcVKpJRJJhBHl/5njunLR6bOgfqRw X-Received: by 10.200.45.26 with SMTP id n26mr7272986qta.183.1506066454751; Fri, 22 Sep 2017 00:47:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506066454; cv=none; d=google.com; s=arc-20160816; b=GNmVpqPjM/s090tMHOLLVkvbireTPCGy7XtPlB+oA/SOb0RDwROHtzkl6l3ty+Ot/f yR+ELtYJUysXnRABlD/Low/jr6YcGoJKF6cSp3Zvm+nXMNEmkV/ts8/muyQNzPuxl/B+ 4OSxnunDFOh4f8GzvIQUa6oFlxkEwkWs6Tj6MTg21hot0ZsxB8OvMUgl+843F6JZwHfF kNC05swKIE4ca+ypPxsJEJlGJQjWyrxAmX2tcyUSSXB+u8RGP7X5J/el2yfNnFKv4mGM 7oMDhAh9gePI8779M4MIaBQFkie6fLCcOBvj0kXln8QNBGblbZ7cc8sRPBIq5wXWSR5c +akw== 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=oMlQanZF5bL+rjRU8hEyI8AizbsNk2rCZ1EV1g35I+5nwDWlLzOqxmWCrVtz6B/WSR 7ef5wHQvvr9gIf8olLMwJIN8Mwv2hp7wZscx5mxUCzvn1XRi05Vz1BJuFoYInw7FYNHL QqY5L4b3L/+X70E8iymMAiFdEJqd2BX52W87SqyMp9H0uGlKcgILPM9rGaUI/BgcBkRo 84YCWtN1QAy9N351pM6pEISMJVoXnMWP7OWd2KmJtrFZgmXh9ZvVDnwGwea3tw3t09Bb Jc4WBGKIHR2KC3uTe9q/EQOA9uvxjmSeuDcNMuyOGQu24d4qzS9yLPEq0tdjfVL21Dst uI+A== 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 d46si3268057qtd.442.2017.09.22.00.47.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Sep 2017 00:47:34 -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]:57133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvIgO-0007qX-3Q for patch@linaro.org; Fri, 22 Sep 2017 03:47:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvIg1-0007pF-Sd for qemu-devel@nongnu.org; Fri, 22 Sep 2017 03:47:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvIg1-0000qL-2U for qemu-devel@nongnu.org; Fri, 22 Sep 2017 03:47:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55820) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dvIg0-0000po-S9 for qemu-devel@nongnu.org; Fri, 22 Sep 2017 03:47:08 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC0577E44D; Fri, 22 Sep 2017 07:47:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CC0577E44D 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-122.pek2.redhat.com [10.72.12.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AD1B5C542; Fri, 22 Sep 2017 07:47:06 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 15:46:25 +0800 Message-Id: <20170922074659.30097-3-famz@redhat.com> In-Reply-To: <20170922074659.30097-1-famz@redhat.com> References: <20170922074659.30097-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 22 Sep 2017 07:47:07 +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/36] 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: