From patchwork Mon Aug 7 15:39:32 2017 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: 9885629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5A1B5603B4 for ; Mon, 7 Aug 2017 15:44:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C99D286BD for ; Mon, 7 Aug 2017 15:44:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40E0D286DB; Mon, 7 Aug 2017 15:44:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CAD40286C3 for ; Mon, 7 Aug 2017 15:44:48 +0000 (UTC) Received: from localhost ([::1]:38031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekCN-0007us-Hz for patchwork-qemu-devel@patchwork.kernel.org; Mon, 07 Aug 2017 11:44:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8B-0004fz-27 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek86-0006ad-A7 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:47 -0400 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:35784) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek86-0006Zv-4T for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:42 -0400 Received: by mail-wr0-x22c.google.com with SMTP id k71so3229988wrc.2 for ; Mon, 07 Aug 2017 08:39:41 -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=zX55oopMfKp58Mp0S2zLwXspD9H7wd7hITYCTAOR7mQ=; b=elYUu0FXuwTtXUohUFTY4NkgIEKejF1WsW/H3HUHQ1k585YkqloQY1Bfvg9EO0NaJ5 LtDZZfjcxgXIWI0H9Xg6XoeWxSUzWAvSd9rnxgYdCEHGTQC74SCmfsdW0zPk48Z0xdXS qfyf77NoLDVbwj5UGQvjSNBKO7sXzl+7zRc/k= 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=zX55oopMfKp58Mp0S2zLwXspD9H7wd7hITYCTAOR7mQ=; b=SGFz+6KW1jvLm+Phwd28aQbdI073cVYdvkEjOPHrAnxTH4A49NdYlAIm1DR31JWuDB LigaMFcB/vUqyPtEvVqoKAyMhzkiwjLLRuzT/SpaEOlLamE/3aA9TdN11MrtveUdkYZo forTcv5R2OLiGQHAFhH6BP0XUMxauF6TDgjwwuYRKtWVzeiOC7zzPiOVrs0/5jngFoI0 Ri4VcjcV/7vpTzRq3kTK6V2ysswY8Pipwd6VlTtX+Tk+a2+9lRX+V7rmRqSdfp0nAT13 5mskiiyamXjm+rnaMvp5iuQrZ1nfVsPymCQAnPuVMbPOpz8SPG5eOSw0gVH7pmMpNr8x ykzA== X-Gm-Message-State: AHYfb5g95JMUk8wuPGB08FET4aPGe7XdINN4eKdcLaDAgcCz+AAC6nF5 09EBBl2E9Mw7Auh0KHXP7g== X-Received: by 10.223.170.217 with SMTP id i25mr684175wrc.140.1502120381039; Mon, 07 Aug 2017 08:39:41 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i5sm10828971wmd.47.2017.08.07.08.39.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id AFA083E04EF; Mon, 7 Aug 2017 16:39:34 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:32 +0100 Message-Id: <20170807153934.29477-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-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::22c Subject: [Qemu-devel] [PATCH for 2.10 v3 4/6] 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , famz@redhat.com, qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- tests/docker/docker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index ee40ca04d9..aab1648cc5 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -261,7 +261,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: