Message ID | 20170725133425.436-5-alex.bennee@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="MKZChZTH"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xGzsl2hW8z9s78 for <incoming@patchwork.ozlabs.org>; Tue, 25 Jul 2017 23:41:15 +1000 (AEST) Received: from localhost ([::1]:60855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1da05J-0000aD-8m for incoming@patchwork.ozlabs.org; Tue, 25 Jul 2017 09:41:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1dZzyr-00046Y-6W for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1dZzyq-0004PU-Cl for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:33 -0400 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:38297) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1dZzyq-0004Ol-6E for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:32 -0400 Received: by mail-wm0-x22f.google.com with SMTP id m85so42437050wma.1 for <qemu-devel@nongnu.org>; Tue, 25 Jul 2017 06:34:32 -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=MKZChZTHIoUS/NQHQq5PBcnFF+ezMTo5uv0KUr1bibaZB4O4gg6yRz4Lr63lKlS1lz ix7gugb2PWp10nVwDdhTZpdvTsis83/YTWNGHWPhNYfYEQSPCSNw/XBr3BmeKYtq1CuC FREMNCjHBll2LQK4NY6RoitEsXoGBmeqpeoR8= 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=QU5rk+WyulFZoO16z06pOYnmXdX0KKUJBaqwNJ+0lxfc0jEYQhGRfbTJ2WGfm+4v/h ctv7g7m9sYNQkLUHbpq2mn0WZGEWpuucySRqdBtoKmL6JQ6LD3wRqdEuDgrKjnw8KLqz JBfi3VsifPDOIDn8Anykr7q4j983SaWK/EW3w0MS4kzNrPvuw8d2C0JNwWC1d48doL8D ZcqZbkLeYiL5V/xvOOsHD221IweZYhKJLL3Cn0PIAf9GswZ9xdp6uDc2gtxGLkrZkFln MdQWzwDWXUrg/XpgUAQvNu4m3J8tmfn4FzMwxqN11nF3j33fAMUKn4Jr5vNMOZC2zKKl 9Iqw== X-Gm-Message-State: AIVw1107EgLruqIsWsVOFPvT+doKDNYlqfFBz9uY+WBr/XmasCvGn/bK fDrElVER3ozSSRDx X-Received: by 10.28.234.220 with SMTP id g89mr8048636wmi.147.1500989670240; Tue, 25 Jul 2017 06:34:30 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b4sm15582147wrf.70.2017.07.25.06.34.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 06:34:27 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7865A3E0C03; Tue, 25 Jul 2017 14:34:25 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Tue, 25 Jul 2017 14:34:23 +0100 Message-Id: <20170725133425.436-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170725133425.436-1-alex.bennee@linaro.org> References: <20170725133425.436-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22f Subject: [Qemu-devel] [PATCH for 2.10 v2 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>, famz@redhat.com, qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
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:
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 <alex.bennee@linaro.org> --- tests/docker/docker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)