From patchwork Tue Jun 19 15:44:33 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: 139207 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5405443lji; Tue, 19 Jun 2018 09:20:36 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKaaLVf48rMfOY+CM67nnGOT4iJ2F+Ej/+yR8NTsgvz9Ak2/IEBhKsSrwGKxRlyNn2WMdNK X-Received: by 2002:a37:bf43:: with SMTP id p64-v6mr14019403qkf.46.1529425236036; Tue, 19 Jun 2018 09:20:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529425236; cv=none; d=google.com; s=arc-20160816; b=mEPo47cvvnH/am6IDN0rioBv3hGSfOiwsXSuV16GcQdkwKSgaHNrCaOmcdVA+xpOrw VT7d9ddpUOQc64enL39l6DySdv666AM3Wz11zDTmA32TlZl7H9XFJKjtv1Hw3MfWMnOw 66NIYSwuVjJmDP7CctzFAinJB2N5gb/i8Iv4VgRFj0bgJJ7T4ElUvzPitKy/cpp72xfV hhKq17rG6LU6H3AbOJhV8Up/NqY2j3taUYcOa1R2wY/ho+OQPHzJVhoQRxubP0G4gIXQ o+nUL+7QDwjglfvAeReCjaZvptVr0lr7KFT3g0+aIaUExO0f0qg5QuakcgDUz5+EqwTs 9kwA== 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=gUGvwPcoATAZINWWKrqT7NQM0xiew4DMZAClax1Ef2I=; b=mPmjtCRxzQ5kw4h0RkhE+tKpji0XqXOQvcX8oMXrd333l+09/GcR91EEHp8+GELrYP nB6lKNDPNmaF0M+uAdqGeamB+ikC9B52Qlc4KURSAczEJV61logZxLxUFjWy4BXQ6QXC nhnFJruX99RNqZ2cSkn9qLYiVroh992o5prSlDb7GkDWmvq3kISu8NvWI9q/WW8LB+QE 4etQRz7k5ZZ9Ll2ifqUbCQyMkLHUaQWKwgXMo38ivaZ4QrYCE5zON0DMujz+Qaxn8AMs A+pro+hEdcoARQbbgpyHdOuwsILihlEnDzniB58PxKiAN0S4NKGwpnjfO8XbqB4Y62pu Kv7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cFMl44S8; 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 f6-v6si4370qkd.264.2018.06.19.09.20.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:20:36 -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=cFMl44S8; 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]:43573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJMx-0001Zx-AM for patch@linaro.org; Tue, 19 Jun 2018 12:20:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIva-0004Mm-Ie for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVIvJ-0001uH-RL for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:18 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:34715) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVIvJ-0001sq-GD for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:01 -0400 Received: by mail-wm0-x22b.google.com with SMTP id l15-v6so19348696wmc.1 for ; Tue, 19 Jun 2018 08:52:01 -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=gUGvwPcoATAZINWWKrqT7NQM0xiew4DMZAClax1Ef2I=; b=cFMl44S8TFl+aCxPyBjUO/6afEF27g9xao+mt1hIlgZqp3zIPjRSUw1wpsWwYXxQKY Hs7Bj8cn61kAltXgoQCLediEM+rPw2r5BdfUVTrEX4OUmIdfLvvq6oIyUJDm9FWUDlBp H3fBXVneVTgPpaMAOX6GZ1R2nD0DDh1OwiYC4= 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=gUGvwPcoATAZINWWKrqT7NQM0xiew4DMZAClax1Ef2I=; b=Bd2fy865U0wUf7D4YsSkHs2ZLsguo5IP1Ca9fNE9fr/7YsecczIEqjyrk7CdtycQsj 8U/adGm2n/T743DYP0o9RlugwvsVoWQQFtUkp+r8G7MWW6O2+N/t4ZPFGLrQ7QpanIzW j3tUpN1OHSrbjOudIzneh4BgJnnXszVXeigX63p8j5pTJuX+tXecWV90FXukgSkVEJs+ x9rIJTI7mFnC/nDcKIV4Rg4JYwnqGbzdIr1ypB49B/5Udnhse9+YNZAhjh3IlEdzwx/m uevCQpzWyVfRFJK6suZ3wMpQj35+DMjou+P6i6gRCN/f3gZW62ue9F6X00egZRMFK2at P4Uw== X-Gm-Message-State: APt69E3R+MKRIh1vaWyh7kYPubZGO9noYqUauJWPMEo+jwYej/IJVXxe 5A1LlsKjB2ScfEtK8h/OaK+yyA== X-Received: by 2002:a1c:470b:: with SMTP id u11-v6mr11866067wma.49.1529423520285; Tue, 19 Jun 2018 08:52:00 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s13-v6sm16734wrq.48.2018.06.19.08.51.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:51:56 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4B10D3E11BE; 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:33 +0100 Message-Id: <20180619154435.18898-55-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:c09::22b Subject: [Qemu-devel] [PULL 54/56] 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: 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" This is useful for querying if an image is too old. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- v7 - use cached info -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 770b22424b..c748c457b9 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'] @@ -187,6 +188,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", {}) @@ -458,11 +462,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() @@ -471,13 +478,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():