From patchwork Fri Jun 15 19:47:03 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: 138825 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1304111lji; Fri, 15 Jun 2018 13:52:13 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKDF7IGE5W/AsZahxE9olG841Xl8B5pK4SF5K3XSEvszZP1oyshY2DhB3c7jkIoO/tjZthn X-Received: by 2002:a37:2150:: with SMTP id h77-v6mr2857395qkh.424.1529095933585; Fri, 15 Jun 2018 13:52:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529095933; cv=none; d=google.com; s=arc-20160816; b=LXckTCNePtNQ4IdXTN3XJPWbCu+r85VtXMw+jYL3aBKz6at5ZwobD90INzzGwdV69H 6syKwJyHxr0Ade2XbOEIeQg8Mbhi5qvW2N6nQnc0uy49Zrkoiw/I5rJMIzOh0RUb+AQC RVoqNLXmres9CBL8ZRm/iGYkaY6WbhHSkJddegjmQuv8fx6N2F9kAa0IMdysGDgS9taf UgTRXnhCLTc5q5fhl+aufSkEUKK6KGCBxjxaBMKjpiXOspb1cf/mtYt3l3o41OHJF3K1 LKpAfcID6vVeEDP3shmhCXMoWWEdKLcz2i8r9yVZqFshNkiQYpdP0k1yt1vo1aP4yqie usxQ== 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=KUdahVU/i9mq1HTJDs12v2i8V4OOTOL0M/sH1KVg8nE=; b=miSCM+4SQ7+uwrPr5WLmQtUx0JeyC5n+PhMTuMkNN1hhWenHQ8WKko15e1tqieUfpC czhdSf3urNjKXL3KVBncBlEiDwi9RDwudfPxx6VHoerEiLLhf8tRzeBpfsgW2OhVTZP7 Wlswt/88biV2OWDNIA4IoY4aZBU0TEn96+lpHtHQ5pcMtCoJqR8SRB4K7S22mj1rq3od UssW0w0YO1TMXd9wJLlR8KAhrN+eqrj/jhjQEgbI+M4wjSopQuwRqVSQsBsyFo843FEv cLJjDkRwGmn4618jOFvi6+OQO7jaSmZm2I4DSW/x59pNoRuFPb0yx7v7xTKdkv8gSGlx GWLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=O1UciY8b; 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 y123-v6si1818266qkc.105.2018.06.15.13.52.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 13:52:13 -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=O1UciY8b; 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]:49359 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTvhc-0001LD-W8 for patch@linaro.org; Fri, 15 Jun 2018 16:52:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTvHU-0007O1-F3 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:25:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTvHT-0000Sg-Fs for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:25:12 -0400 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:41460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTvHT-0000Qc-8C for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:25:11 -0400 Received: by mail-wr0-x22b.google.com with SMTP id h10-v6so11027808wrq.8 for ; Fri, 15 Jun 2018 13:25:11 -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=KUdahVU/i9mq1HTJDs12v2i8V4OOTOL0M/sH1KVg8nE=; b=O1UciY8bHHYCtN+SMRe0r+hqjq/xBXM8qaIHs6WNaEhsF1pJdHbe6ZrvxsXFuZCU6u nG9HwQLU1MzEOfUSmDHxUcUBvhlmCWCkJa1tJe1ipCM/RW/c7CvNozR0+khI64JXhRkg ueYp9L0ZQJaL7FQvWM7fyY6jmOPE+fz1ilZ6w= 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=KUdahVU/i9mq1HTJDs12v2i8V4OOTOL0M/sH1KVg8nE=; b=Pc8TE9Th7swynLBg8sSLlIZ9sr16EvPuwn3DJ1EvsJM4tKYhHVumtKeA5VKds3HZUS IT6X8eLmP5BbB6di9IClZkVysjKy+888T02RktivItadlS1yns/yJH7M4UrnTFi7skrw UttYFknEsBG3JzuI6iNtBgc25ZFDkt7zx2NUIT3GNBb+cVRTDjksAxGrcNX/AyqkHG30 HOaog4kntsYjLEejKsVq2S6oifYobe0twuf2yOILKIYZH8Hzs6Wa64MoabYKYNb6+jJN E7ZyEkJraKasepNsgN2yXFxFk4I4LzgVTY7tSQvanRSZug62WIVW2EhDB7EIKuq38S4J kdQA== X-Gm-Message-State: APt69E2aDBRnbQceLofGxAdgitmw4V4RHXv3v6rMLgnfqGpumy9HU4c0 HVi/1gO/diGe/wc+QVnXvpLGug== X-Received: by 2002:a5d:4049:: with SMTP id w9-v6mr2904040wrp.96.1529094310153; Fri, 15 Jun 2018 13:25:10 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l41-v6sm14496439wre.87.2018.06.15.13.25.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 13:25:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EDED03E106A; Fri, 15 Jun 2018 20:47:09 +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:03 +0100 Message-Id: <20180615194705.28019-53-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:c0c::22b Subject: [Qemu-devel] [PATCH v7 52/54] docker: docker.py adding age check command 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" This is useful for querying if an image is too old. Signed-off-by: Alex Bennée --- tests/docker/docker.py | 49 ++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 11 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 3666197a16..ad0c47921a 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -29,6 +29,7 @@ from tarfile import TarFile, TarInfo from StringIO import StringIO from shutil import copy, rmtree from pwd import getpwuid +from datetime import datetime,timedelta FILTERED_ENV_NAMES = ['ftp_proxy', 'http_proxy', 'https_proxy'] @@ -184,6 +185,10 @@ class Docker(object): labels = json.loads(resp)[0]["Config"].get("Labels", {}) return labels.get("com.qemu.dockerfile-checksum", "") + def get_image_creation_time(self, tag): + resp = self._output(["inspect", tag]) + return json.loads(resp)[0]["Created"] + def build_image(self, tag, docker_dir, dockerfile, quiet=True, user=False, argv=None, extra_files_cksum=[]): if argv == None: @@ -450,21 +455,43 @@ class CheckCommand(SubCommand): def args(self, parser): parser.add_argument("tag", help="Image Tag") - parser.add_argument("dockerfile", - help="Dockerfile name") + parser.add_argument("dockerfile", default=None, + help="Dockerfile name", nargs='?') + parser.add_argument("--checktype", choices=["checksum", "age"], + default="checksum", help="check type") + parser.add_argument("--olderthan", default=60, type=int, + help="number of minutes") def run(self, args, argv): - dockerfile = open(args.dockerfile, "rb").read() tag = args.tag - dkr = Docker() - if dkr.image_matches_dockerfile(tag, dockerfile): - if not args.quiet: - print("Image is up to date.") - return 0 - else: - print("Image needs updating") - return 1 + + if args.checktype == "checksum": + if not args.dockerfile: + print("Need a dockerfile for tag:%s" % (tag)) + return 1 + + dockerfile = open(args.dockerfile, "rb").read() + + if dkr.image_matches_dockerfile(tag, dockerfile): + if not args.quiet: + print("Image is up to date") + return 0 + else: + print("Image needs updating") + return 1 + elif args.checktype == "age": + timestr = dkr.get_image_creation_time(tag).split(".")[0] + created = datetime.strptime(timestr, "%Y-%m-%dT%H:%M:%S") + past = datetime.now() - timedelta(minutes=args.olderthan) + if created < past: + print ("Image created @ %s more than %d minutes old" % + (timestr, args.olderthan)) + return 1 + else: + if not args.quiet: + print ("Image less than %d minutes old" % (args.olderthan)) + return 0 def main():