From patchwork Tue Jul 17 19:55:48 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: 142220 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp6282ljj; Tue, 17 Jul 2018 13:19:50 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfeijOZjkB9N9bF3aHiXn2Q1eyXySSPQv+4esktchg7IQGMXCm2/lwGTjgm10I8gyopoV5o X-Received: by 2002:a37:32cb:: with SMTP id y194-v6mr2834167qky.11.1531858790761; Tue, 17 Jul 2018 13:19:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531858790; cv=none; d=google.com; s=arc-20160816; b=bfQKiogf/7EcpFud4AZy1x82T60AA3OrkaLRyJzQ6xi8IX791qWs1LzdHFHl4yG263 3EPMJVZgxr8D/LJrIB8zcbZCfZF+FRJssTrskl7DTdOvaAYBbDYj8Dgpf8QTtLoEzrTM dT+I2ORaVqaBKu+QNCWu4PcxTfgBTxizVLlX4bRHm3NTko52Itg7QN8eZqCOX3aXZYfR TEnTDAuH1IzkfTO/t2mCG1IQcBomqNKRDAWjsKMRyEiQd/37dp/dtLcKUltq8l7DFAt4 KT9A/RFuWSYIwhtWkH9WV8pQ++5/6ednFT3GNElNLdIOjsA1Q0pMzUJBIcDxZNI1bq0z 6xjg== 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=2hyT9r7n/kLLoC+J5hjkAOX9XXtoKXwld53Aqui1SWQ=; b=o7r3f4+YZFONyR9NdeLLG2BycbhTlCsfz1D8nGa0mlD9q9VIM2qaZunDOkDJI0BIgO FKhlco16HvdH8D7W/NzToIoLofsSn3OXVfDgreiYfnABHZixrCjO5GvfxABTPQ4jSCM4 NAwDzZ5th3es6e6hdzoEsYuOmqV62riIzAaTQZyMVERdK5uPorEHNgxFTytlJWlvuYPr H7IlojaukyJH0R/OZMAB/O9kkh8qM7vq6EZb9hpEkHg2ZMpjEQ5DbYly+OqcrovRaitn zP+SopJwdPd6WZnBMukxu6UfVpsrBTBmMFrAciV67mBg7cDlBb4cQGhyDdW/YO8TB40/ AfCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DAGjvORw; 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 p84-v6si1134439qkp.268.2018.07.17.13.19.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:19:50 -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=DAGjvORw; 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]:33046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWRq-0002Qp-56 for patch@linaro.org; Tue, 17 Jul 2018 16:19:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWBY-0000cm-6R for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:03:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffWBX-0001je-9O for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:03:00 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:37082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffWBX-0001j1-23 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:02:59 -0400 Received: by mail-wm0-x235.google.com with SMTP id a19-v6so566036wmb.2 for ; Tue, 17 Jul 2018 13:02:58 -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=2hyT9r7n/kLLoC+J5hjkAOX9XXtoKXwld53Aqui1SWQ=; b=DAGjvORwaddBCYIeH5hOiBtm75uCUhgCA3zb4r1WBKpbK2jPvATyEmzZ6aDY2asabF kA2Gd7UZ4TtRH8bRVZeLhHm1zLkt4CYESSHfr7kN9o55oVhaeUMpSw9vcQsjnAyUZ9KQ sjW4c4wOLMyZFkOGIcwvSSdtkY2gYw3V8brrw= 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=2hyT9r7n/kLLoC+J5hjkAOX9XXtoKXwld53Aqui1SWQ=; b=HvxsXE4v2rqS8MBoZSfACf/bLq14mdVOQdcU7tIVv11hFcaKA9id4/46NE2xMd07hW GYPQFgi2dI4IIPwlc+bG5eFu3eZSMBqPcNiCn+kejLKjG9sWoH/lbUxVKCJDqX9V1osy NxGKmQ0wX+p2DCvNqn+GwCWo2phLrPavT6v/Sw49vw/U17a3FGpMEglNhgU+w7Gp6nsD J7zUePH8CdXWYrRF+iyPgAluR8dtBZEhhh5zQF5XFZCvVwSQhjDUavdLrA4Oqu2nw++l QWkuYJlfDLK+7R47B3ja3mZ3wO8+/5WnCLZQA44a4/9r9HSxSCHN85Gqa5Z8fBnc4hr/ 33lQ== X-Gm-Message-State: AOUpUlFiRpUfuH4fUqwbvaEWdSYPKfC+yXDRbZZwyPz7fh2gnxOJB6rX mhVCCQPmsCOjSHTtHvwc93U1pA== X-Received: by 2002:a1c:70b:: with SMTP id 11-v6mr2189078wmh.151.1531857777876; Tue, 17 Jul 2018 13:02:57 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 185-v6sm767082wmw.23.2018.07.17.13.02.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 13:02:52 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DBC233E0C98; Tue, 17 Jul 2018 20:55:54 +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 Date: Tue, 17 Jul 2018 20:55:48 +0100 Message-Id: <20180717195553.9111-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-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::235 Subject: [Qemu-devel] [PATCH v3 for 3.0 13/18] docker: add --hint to docker.py check 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" When a check fails we currently just report why we failed. This is not totally helpful to people who want to boot-strap a new image. Add a --hint option which we can pass down to give a bit more information. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 3 ++- tests/docker/docker.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ec23620153..c9e412f9d0 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -73,7 +73,8 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ "BUILD","binfmt debian-$* (debootstrapped)"), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu:debian-$* $<, \ + $(DOCKER_SCRIPT) check --quiet qemu:debian-$* $< \ + --hint "you will need to build $(EXECUTABLE)", \ "CHECK", "debian-$* exists")) endif diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 2f81c6b13b..523f4b95a2 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -475,6 +475,7 @@ class CheckCommand(SubCommand): default="checksum", help="check type") parser.add_argument("--olderthan", default=60, type=int, help="number of minutes") + parser.add_argument("--hint", default="", help="hint to user") def run(self, args, argv): tag = args.tag @@ -487,7 +488,7 @@ class CheckCommand(SubCommand): info = dkr.inspect_tag(tag) if info is None: - print("Image does not exist") + print("Image does not exist %s" % (args.hint)) return 1 if args.checktype == "checksum":