From patchwork Tue Jun 19 15:44:34 2018 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: 139191 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5393667lji; Tue, 19 Jun 2018 09:10:17 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIkNwdQA+Xd5TEBmUVMK4AhPTf1LU5gSuxvf82pTm09YZbVcQqjVoLIq3QWCgwaqn1nNapo X-Received: by 2002:ac8:6110:: with SMTP id a16-v6mr14990617qtm.389.1529424617371; Tue, 19 Jun 2018 09:10:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529424617; cv=none; d=google.com; s=arc-20160816; b=i2AFP2vC/XuYptx+ixSKsOzwCLT1wj5sxOUrpBgSX/ryA+phQcVVRHhJPziIHvr9m+ p8s+KnaGjJWanTizPTu4VwFr7GZuStUVdoTQkWX96b8VVCFG8FSXiReLq7jH5OB+m9bc Nvon3HmgwzTEO4y46EoqNYRjGbK2cmIjJB1IP8yrqDK15VeseI1FdW8LAgEuB5C50/o9 5OVjpN3+sC5t03fWXsamuXi1HIzMrdls/nCOR6FQnbghkviOo7n8Tn1Z9n0VwG5LlFs4 3bdIGsV5NGDtm22aNNnplapky2rftkkasqs463ruNtau4O5JeCOSWpaBjS4oR7TgjbUU wgVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Da57ECTJ27F1UqzcF6YwMSIUfcwat0ZTTT73wmFouN4=; b=H1vRc/AeZES6JFsXJC5k7/RsbdZgmOdYqErjKwjpca4trfV9IIyy66Djng98kz0xSW lyIyGrFJzVDNxxah5G3SdzFRBEIeAcOZv3lvGnkOzxAeeY1zAo6r+nKaA2blFhPbrOEc FcTgjYQiDrg93sYhWyfjVsm7mfLQ5oKD/3AB8kbPZ11ybATdCFFjOnKUaeeh5/OybfGP 6p4pw6tO5owr4D/Z8l3Th6mJzrXyfmCuynBIGKd4nZXQO6nvmlRBWseA3QozSwBZDH7t DCnqN4mEBJSC8u79XnwmVhQwRAztXVDxi0uWBkiiCO3ut+FpILK6ozciCXj8X6CGIiGZ +8Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="V4pWTGy/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j3-v6si81419qtp.72.2018.06.19.09.10.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:10:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="V4pWTGy/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJCy-0002td-Hz for patch@linaro.org; Tue, 19 Jun 2018 12:10:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIvJ-00048t-V6 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVIvD-0001kv-2b for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:01 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:36825) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVIvC-0001jz-NU for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:51:54 -0400 Received: by mail-wr0-x243.google.com with SMTP id f16-v6so186005wrm.3 for ; Tue, 19 Jun 2018 08:51:54 -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=Da57ECTJ27F1UqzcF6YwMSIUfcwat0ZTTT73wmFouN4=; b=V4pWTGy/ahcya5xJhbtarK9N4P3yP/3hQQm+iwnS5XtmTnKzhNH5eP2hFvAxI2eJ+2 PIWLTahIZBdo3CX7HbhmCN0TkkARfhYVtzZ80Rhz33MICucF5RQV2JfsSt79/qxmnuZ0 c6o9306U8hXNWzlyoQI2M6A+tP04lRkd7NTao= 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=Da57ECTJ27F1UqzcF6YwMSIUfcwat0ZTTT73wmFouN4=; b=dPMse5FPfz1FGXzSNBo/F2hkU0WBHWa1rsnJ58893PKd1Les3oj8Nym3PbgA3AI6J0 QPLov7pka1xbq/GbxEP5HaUyUrTENKwtkE522R2o6wQbPYOtKJDJFi1ORwJ/0jkc2dsM 4bvwQlL0xH/944/+oHHgc9o2P9cW7qxYNt/IrYQzrQMEbrt1fi3c6aU4Uy6pV7NtFgHs AhHSgcVVjMSFHb3dc9lr8nulrMwu5kL3LbRFZ5FJvCMoDZlo/CPyybPGQBCfNtoi1dCe GSys04qrOyzIVQEU7VILqhPZPXIGBLsaNYWZNSQLB6VieNTF2I7W0sWdF7sA8HPfg7RT kwnQ== X-Gm-Message-State: APt69E33ht0lGbVXC1gE6970I0DIQWbnMsU0VAGxXkkDhJmYvgBIWjZc mbKTkFFoNh8g2PytCO+nuAEGZQ== X-Received: by 2002:adf:cc8e:: with SMTP id p14-v6mr13594561wrj.226.1529423513597; Tue, 19 Jun 2018 08:51:53 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 203-v6sm586021wmp.23.2018.06.19.08.51.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:51:49 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5DFA03E11F5; Tue, 19 Jun 2018 16:44:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:34 +0100 Message-Id: <20180619154435.18898-56-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-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::243 Subject: [Qemu-devel] [PULL 55/56] tests/docker/Makefile.include: only force SID to NOCACHE if old 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now we can check the age of a docker image we can be a little more intelligent about re-building Sid images and only force NOCACHE if it is "old". Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c0f09505bb..91d9665517 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -75,8 +75,14 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe # 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