From nobody Wed Nov 5 02:52:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500990117129196.17343840043884; Tue, 25 Jul 2017 06:41:57 -0700 (PDT) Received: from localhost ([::1]:60865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da05w-0001Av-Rp for importer@patchew.org; Tue, 25 Jul 2017 09:41:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) 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 ; Tue, 25 Jul 2017 06:34:32 -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) 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: quoted-printable 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: 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 If you invoke with NOCACHE=3D1 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=C3=A9e --- 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 =3D args.tag =20 dkr =3D 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: --=20 2.13.0