From patchwork Thu Jun 21 06:26:04 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: 139494 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1703569lji; Thu, 21 Jun 2018 00:06:20 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLE0m8p44RFkH/jlaAec4vY0u5azjhvBLottsbiiKo9Sdc9mqexrQTpzD7W9gXsjBjP8aah X-Received: by 2002:a37:849:: with SMTP id 70-v6mr570254qki.200.1529564779337; Thu, 21 Jun 2018 00:06:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529564779; cv=none; d=google.com; s=arc-20160816; b=cUkS/kku8On2A4uDuwwkF8e5AzmdIyHFGaQsQh1f7WXbX0OfqsTbvntOmjnQ6iQquX MolVjEIIZLNY6qxzKXhKqg+7WNKXZvV9wC4heiidNAvlh5VPJjgQvcr499DmHzkcZNLM y4FxvX01A4cYMGtyRfOPlkfsl1PoPXsTOHEeZgThx1bLoMp8pkiu15PZfxBlV/mico1D qxYSGvAWLTaqGYegi1bu0PTTXyVqgldl5V7a6HKiBR4DcofihByPx1cA9Syg9Gz9koxB LBoKIGHl76N2EZf85adRdMHEF6lLoY+xRfjWMLI0ph5gVqwG93siaXxbJr8Ra7w8m10D 1S2A== 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=an951dR6b91YFc1yQw5pCpWeLOOx2drY/MrvIQxdI1L/p6WBeQ6Z9xkoM7HHyzcqDF K60HVnw08LDCHj9zRw8tN51id5mh6K9+3ClLLGOTqSmYAOeQ4QVkcsTX3mNN8ergES+g JKoZPST11APJpOyGApQS8bi21LdQWktPqhP8Y+pIffoVC/OU4dZsODJG0wl8d+4LoH/E BYJHM+MNxjyfmkqh4gI53k4ExqDSn+pLcmVK17TMysjqiEBv/LkIj4OiNcDrvUUpb+4G QvDWoQt7TUHdRwragLXywda53zelx4rZXL/Q0Mh4wCYKyTA22v9kzwLeF1K6AtchBrRN Fq1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SIty9Asd; 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 j126-v6si4123605qkc.31.2018.06.21.00.06.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Jun 2018 00:06:19 -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=SIty9Asd; 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]:53465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtfe-0007QM-O0 for patch@linaro.org; Thu, 21 Jun 2018 03:06:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVt8Y-0005mU-6y for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVt8X-0003uQ-BH for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:06 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:42773) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVt8X-0003ti-3u for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:05 -0400 Received: by mail-wr0-x242.google.com with SMTP id w10-v6so1826597wrk.9 for ; Wed, 20 Jun 2018 23:32:04 -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=SIty9AsdwSospjmHWLciLb5mqGocz4Os9Rj0XhUOaWMO0+OCwt2HptVNYks7k1oW1r rNGOR2kkCGLuHvH4Gu1SwjBHPoO9idW/TAUhOnYrLfX3Dl7shrN19RVzqhrwewV/aF+O xbo/hjsLfzhAaaRfAfibB/vpdPIiSJ7IAAyb4= 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=Q/AeXFjPz4UbMOeowdHsZxLpEmxMiD0WmdbdkUh7Wyl1h6ByB75B8So8v1eWyKUoi4 QoRMn2K59DHmTEWrf7bcg9T3/Hmepx05JCvlExsxo4izp4lhmulhVFKUfLhf1fXrUshc 5r9FA+I2+eU5oqOb+/zT9RjpYr2RQiPKTsYUrEacDUfx4m3plkzO2w0btyKrEOQLwRjc YoPrqim1QYuQUmILDpSTO3EoPnOy01PUyuN5mqYEBxhoCx/bsIxHSUcMp93MyaVeBPjt 27ODQVXBFz2LANvLCaXBZvPzo144yvDYYMTx1KtNdk/O4mkTklkTd55K8CbD+/En5BWm /B0Q== X-Gm-Message-State: APt69E21seRw3/GF8uP7Y+cEds7sNqmm2+falabu+XB1nn0v7qE0ObT6 3V6pdJ6hFds7piyKx1AZ5l/PQA== X-Received: by 2002:adf:fe4c:: with SMTP id m12-v6mr19610937wrs.171.1529562724127; Wed, 20 Jun 2018 23:32:04 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q17-v6sm5060664wrs.5.2018.06.20.23.31.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:32:02 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 159633E154A; Thu, 21 Jun 2018 07:26:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:26:04 +0100 Message-Id: <20180621062605.941-57-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-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::242 Subject: [Qemu-devel] [PULL v2 56/57] 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