From patchwork Fri Jun 15 19:47: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: 138780 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1266739lji; Fri, 15 Jun 2018 13:08:37 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI6TwMbZ+BHHmV/UiqodZeQBmU4DskA+EGZmXYTIUDOKkTXyyY1N9XgJwFI39iYD/VGREoi X-Received: by 2002:ac8:271c:: with SMTP id g28-v6mr2888973qtg.45.1529093317319; Fri, 15 Jun 2018 13:08:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529093317; cv=none; d=google.com; s=arc-20160816; b=H5wNNlYWjO6Qu6TnZCx2a0UvMs0Dazu2hWLkwxhXbpr6+fPufpDv6wqjtcXBiKcYj0 mLZIZJfY1oXyAqm5tAJmbXW5USNEdSoeHkU/TYi0aZOyDu8VJODRlQMO39xQZZYuz6bj o8OywV9PwQ5VY5dp2xtBPwthGqTdO1NpxqEroFEesGeTU1zD477HE5ItdZ38Ha7qHDIv 5SNxRDkow2VL9tPZUC7OSvX3xgctwDjklBsNfUohEPoCzAwQXhJrA3Ip7Wox/1G2/tco v98lxv2pNORJfSp/J8RAjL2ijDRU5+RhfV3FV1Dft6n5WmqVJtGXkZGENJUGG5u/wQFK gkDw== 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=ufQhKjgdbg3a8n0Vys6yHTSzTkyMPkWTfgf1izDw2TM=; b=SGcxRjYANqMULi1qDNRv6LsDzZyCzjJMFJdTKSSlVmugls9PjJPQfk3svMRjPm7tTC ugLH1WZejQ0eQTk+rNgwU1MB803k7l6f2ese2MI1zxtFFKwYSrI3ITH9XF3YIuuHUzk+ EQxKNx1Mx+fqgEJwSTeePS3rqK5ALxYkeHNLdD313WJ1ostWnCc3FRd+Ixk5vRBTatj7 /ADRvzPWLatzdDh0gxS49sBxOdzCn/z/RcPMNJgdLgdBlbWC++1TrtdwGTeDOAz5ZwCp Ppg3QPPFSjCoKMeRoYLtqIdKRsfcl2Szy3QrDYNB4muli6bfXhyw4eZEqpNdOiPbSSsw Ckxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DEq4qiN6; 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 37-v6si7504125qtp.243.2018.06.15.13.08.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 13:08:37 -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=DEq4qiN6; 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]:49087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTv1Q-00036Z-N5 for patch@linaro.org; Fri, 15 Jun 2018 16:08:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTuoX-0000X2-7k for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTuoT-0006Ro-0k for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:17 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:52294) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTuoS-0006QL-Qa for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:12 -0400 Received: by mail-wm0-x241.google.com with SMTP id p126-v6so5226064wmb.2 for ; Fri, 15 Jun 2018 12:55:12 -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=ufQhKjgdbg3a8n0Vys6yHTSzTkyMPkWTfgf1izDw2TM=; b=DEq4qiN6nmF/kWOOBXfSeqJrCm/VZezTPc/I26w2XOS3Kg5OyzZ06hPds9rBJGuyLM uxHYok8l90sUw53TbAHElp2GeaiJVaGITemw7GvFk4IIDpOVMHODIKR56ZuXxhn7Cfxu Xeka/JKIr4EMCSxAmZJrb3hZ6VmP0xidPYE08= 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=ufQhKjgdbg3a8n0Vys6yHTSzTkyMPkWTfgf1izDw2TM=; b=YdAziegLFruSpNpC+1w9I91sRViKA3lLl3syJB0uSB0JDAez8XrWa2lcUvrpTFrmU6 NQdJEGYA/ir1e0E7Ru0rPzcViKv+9/TmTsnL/rqkdCX/KUoV1+88qTKOkK1XQmytpKri yV/j/pCanZ4Qiz7/HWo9+P9ZsmsDSFypQK/E6UoNFYsZh0vc2mN4R+jphV66WJ0r2TQ5 N+sC3r+oEMmun0qnqn+Y7fJ/WwM8jBZPZh6GJd/NM89vPw8T7OVTDm3blnHZqsR3WliP Vyf52baI/XVIwXIedGSeSUrUQ9s/bbllIhPbfuahT7Z3FtOjTf6RusEPd92Gc8yhSn5g N4Ng== X-Gm-Message-State: APt69E1483UUucWEB1AWdBcKBqAgETl0hc+mxFM6ZiN9Krqy/tCmZd23 Qvh+LuIFmOG3XSfg+iOGtewXmg== X-Received: by 2002:a1c:7501:: with SMTP id o1-v6mr2288633wmc.133.1529092511604; Fri, 15 Jun 2018 12:55:11 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n18-v6sm10090675wrj.58.2018.06.15.12.55.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 12:55:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0D0DA3E050E; Fri, 15 Jun 2018 20:47:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:47:04 +0100 Message-Id: <20180615194705.28019-54-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-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:c09::241 Subject: [Qemu-devel] [PATCH v7 53/54] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 --- tests/docker/Makefile.include | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c0f09505bb..193fcc79fd 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=60 --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