[PULL,19/21] tests/docker: remove SID_AGE test hack

Message ID	20190114150129.1013-20-alex.bennee@linaro.org
State	Accepted
Commit	d406015b6a1e0cc8eda10816ddbecd7917f79297
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:27 +0000 Message-Id: <20190114150129.1013-20-alex.bennee@linaro.org> In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 19/21] tests/docker: remove SID_AGE test hack Precedence: list Cc: Fam Zheng <fam@euphon.net>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	misc testing fixes for Travis and docker \| expand [PULL,00/21] misc testing fixes for Travis and docker [PULL,01/21] docker: Use stable git tag for virglrenderer [PULL,02/21] tests: run ldconfig after installing extra software [PULL,03/21] tests: remove obsolete 'debian' dockerfile [PULL,04/21] tests: update Fedora dockerfile to use Fedora 29 [PULL,05/21] tests: update Fedora i386 cross image to Fedora 29 [PULL,06/21] tests: use in-place sed magic for enabling deb-src in travis image [PULL,07/21] travis: add whitespace between each major section & matrix entry [PULL,08/21] travis: define all the build matrix entries in one place [PULL,09/21] travis: standardize the syntax used for env variables [PULL,10/21] travis: don't clone git submodules upfront [PULL,11/21] travis: use homebrew addon for MacOSX [PULL,12/21] travis: stop redefining the script commands [PULL,13/21] travis: stop using container based envs [PULL,14/21] travis: run tests in verbose mode [PULL,15/21] travis: remove matrix settings that duplicate global settings [PULL,16/21] docker: Use a stable snapshot for Debian Sid [PULL,17/21] travis: bump to Xenial baseline [PULL,18/21] tests/docker: update our Travis image [PULL,19/21] tests/docker: remove SID_AGE test hack [PULL,20/21] tests: use g_usleep instead of rem = sleep(time) [PULL,21/21] Revert "tests: Disable qht-bench parallel test when using gprof"

Message ID

20190114150129.1013-20-alex.bennee@linaro.org

State

Accepted

Commit

d406015b6a1e0cc8eda10816ddbecd7917f79297

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	209.51.188.17 as permitted sender) client-ip=209.51.188.17; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Date: Mon, 14 Jan 2019 15:01:27 +0000
Message-Id: <20190114150129.1013-20-alex.bennee@linaro.org>
In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org>
References: <20190114150129.1013-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL 19/21] tests/docker: remove SID_AGE test hack
Precedence: list
Cc: Fam Zheng <fam@euphon.net>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=
	<philmd@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>, 	qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

misc testing fixes for Travis and docker | expand

Commit Message

Alex Bennée Jan. 14, 2019, 3:01 p.m. UTC

Now we are using "named" snapshots of debian-sid we can rely on the
existing checksum mechanism for detecting changes.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


-- 
2.17.1

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 9467e9d088..7032c68895 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -98,19 +98,6 @@  docker-image-debian-s390x-cross: docker-image-debian9
 docker-image-debian-win32-cross: docker-image-debian8-mxe
 docker-image-debian-win64-cross: docker-image-debian8-mxe
 
-# Debian SID images - we are tracking a rolling distro so we want to
-# force a re-build of the base image if we ever need to build one of
-# its children.
-ifndef SKIP_DOCKER_BUILD
-ifeq ($(HAVE_USER_DOCKER),y)
-SID_AGE=$(shell $(DOCKER_SCRIPT) check --checktype=age --olderthan=180 --quiet qemu:debian-sid)
-ifeq ($(SID_AGE),)
-else
-docker-image-debian-sid: NOCACHE=1
-endif
-endif
-endif
-
 docker-image-debian-alpha-cross: docker-image-debian-sid
 docker-image-debian-hppa-cross: docker-image-debian-sid
 docker-image-debian-m68k-cross: docker-image-debian-sid

[PULL,19/21] tests/docker: remove SID_AGE test hack

Commit Message

Patch