From patchwork Mon Jun 18 13:07:09 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: 138935 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3938431lji; Mon, 18 Jun 2018 06:12:43 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLUHWu7RNqGoK+G7Gwn2bIipxLjbCvm/IJKaLeNOuEShGkQvKSB4pqPwzoBLkeZtihohKao X-Received: by 2002:a37:129d:: with SMTP id 29-v6mr9977631qks.263.1529327563788; Mon, 18 Jun 2018 06:12:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327563; cv=none; d=google.com; s=arc-20160816; b=m2vdoCRbHIjuSzrNFrML2fbzSWyUTp40JL0XDPCToVTY7LLF7nhg5XOzk3W9SfLcG7 x03oOGoBOFqqHfVGtbYHsx06vEUwyCLy9IEi9lrnLW178V4RoSNfGZ/pb7NZd3tGDho7 UaJ8P3v31ZgSPfC2KA7gEjElS/hAH+qDqb0b+B6xCFO2WLOTKU98zZVyBL0k8uxyu/Bn Zlco/MLqRA5FZHzuYc9GnPRv1mPXpwrxyDutL/EyK6lJwKyP7dot4FisS+HZFyi1Pvjs Ki0PbkD2pLk+RrOB0jRF93ddAQPHR5Eni1s2NB3Jd7QWijc35HBlUGEwsD/1G+eOIHTW Z05A== 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=Drk7yosOJoszpUb8YawNCIAsnE+MnRqM7ImKUYir8Cc=; b=eTbXDOkJ4e8ycjAm8gCCk74zOmcLNgS6MJ5z7yL4piF7kbCcicSzNUgrCOyGIFeymc lAyc/z/VF4oUnlsT6KHHRt0Kdpc2yOnRe/soTbwq3XuB/+QX6aQ5XlgiPX8ZgAG/r2wQ /7bO0zHNszoy1HIg0TlnttKXY9yjXqdTv0Yv82pbTryqlM/RhvGOez+RvfYui7s337lj 01nTOk9XpRoIRCqC/kAIoZX8Y2jqre0o6jM2Gwu45PFIN34eZayV48NdGTZUtfVsyk3Y 9ipAOkKmXkQXldQrtQiX3OEArMMLPZ1ggLubpnOOEBiFE9ELeL8pUgfRXk7MjrntBAlu hg/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OEp5HDc4; 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 a64-v6si13376103qkd.158.2018.06.18.06.12.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:12:43 -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=OEp5HDc4; 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]:34737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtxb-0001n7-8q for patch@linaro.org; Mon, 18 Jun 2018 09:12:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsN-0005yM-O2 for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsM-0002fq-Ik for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:19 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:37881) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsM-0002fV-Bk for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:18 -0400 Received: by mail-wr0-x236.google.com with SMTP id d8-v6so16781794wro.4 for ; Mon, 18 Jun 2018 06:07:18 -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=Drk7yosOJoszpUb8YawNCIAsnE+MnRqM7ImKUYir8Cc=; b=OEp5HDc4dEsf6NYqXC5lCRjqihh0OTTcHgDDYIuFAh/K0VcejbTjF1m/Ibgzd/YLM5 drY1Qf5SlupmdTD/RkSrOSLKTVxDTQWxNw6SP77ZMOq3slCWuZou3R7Mws/tJ0B8gwml 5+lOW0rPHLeuhywIXDtIjgZAV4KClXpmK52yI= 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=Drk7yosOJoszpUb8YawNCIAsnE+MnRqM7ImKUYir8Cc=; b=RFAM6sZyqpTB4noQj29TDaGypgOx4FGMSqdqxb21j5yswLdmvcfYJd2lbMIsa0m4Fi r00WDOD0+VgBy+QWAMNpKZuhdp40sjzteCLA9/kFrsRyyVSgB0RvZzTLh8zKnWzqd9e3 Y+rE2f6j2fivt5lJHvPY27PhfTKdf6oq3gQw2pbpQHMc1RG3MWweskxl+449c66EB1ui ZA2/BNrSujpMVBQ7hjUII385sOMkE8Mi6biHWMrcQ0MMOVCJIeDwjtp1NRxvaoGR1A4v QZve6CT6pJI9xZ8DXgwXi8R8JX70vGtdFlP4batwVDM9AlbwNRfWsZJhXnNiBvL1Vau/ CAaw== X-Gm-Message-State: APt69E0tbDRjoos0c9gd6T8WNj/JszweOjp9Nh0aCKHUVex481LCbkDT E6QRU2xfJxhTZVM1Yhra61w8ZQ== X-Received: by 2002:adf:f18b:: with SMTP id h11-v6mr11031036wro.214.1529327237315; Mon, 18 Jun 2018 06:07:17 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b80-v6sm9119626wmf.2.2018.06.18.06.07.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:14 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E70283E0768; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:09 +0100 Message-Id: <20180618130709.19730-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-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::236 Subject: [Qemu-devel] [PATCH v1 8/8] 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 --- v7 - use cached info --- tests/docker/docker.py | 46 +++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 10 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/docker.py b/tests/docker/docker.py index c157ff826a..da1ed4e879 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'] @@ -185,6 +186,9 @@ class Docker(object): except subprocess.CalledProcessError: return None + def get_image_creation_time(self, info): + return json.loads(info)[0]["Created"] + def get_image_dockerfile_checksum(self, tag): resp = self.inspect_tag(tag) labels = json.loads(resp)[0]["Config"].get("Labels", {}) @@ -456,11 +460,14 @@ 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() @@ -469,13 +476,32 @@ class CheckCommand(SubCommand): print("Image does not exist") return 1 - 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(info).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():