From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqG0O-0007do-Cg for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:55:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqG0J-0004Fi-RI for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:55:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dqG0J-0004FD-Kt for qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:55:15 -0400 From: Fam Zheng Date: Fri, 8 Sep 2017 17:54:30 +0800 Message-Id: <20170908095506.13594-3-famz@redhat.com> In-Reply-To: <20170908095506.13594-1-famz@redhat.com> References: <20170908095506.13594-1-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 02/38] docker: docker.py make --no-cache skip checksum test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell From: Alex Benn=C3=A9e 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 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(-) 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 =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.5