From patchwork Fri Jul 13 12:17:38 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: 141871 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp737574ljj; Fri, 13 Jul 2018 05:24:42 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf+N+DhKqXme51V/NIzQyqLGXUJmiG/X7lhuAVsrSEaXMTR8cDN3amTJUDRJOzO+CnO8EGb X-Received: by 2002:a0c:9dc3:: with SMTP id p3-v6mr6844708qvf.211.1531484682210; Fri, 13 Jul 2018 05:24:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531484682; cv=none; d=google.com; s=arc-20160816; b=u7h+WR+qqYJT6rAdDO2f1jW8380tc9M3mNtZJzPQCfmXtc76jbeTALYyqrwsGbfeCW Fem/y5khFB7WDRG73mUikaQ0Q3LWnv2zfaApLoL0XqYGnbaXJfLcPAbJNuPDsjpfaPPs gAMVNDpAWuVQ1rQgVmCLnrNeGhEkNz/Jmdbo6ay7K2LMzptnoOf46JJYPV+syhsGMggz sDQDZGC9vrzi90eRsHtwtbPZSc3tEFHLAcxFG/TrJ8oF6tIbLxctOvn4QixO06f2FIlW b1EC0T4c9ji2MN0AlIqJ/bKs5R5L2Huj9qAaNKueK2wNqj7N4t4ahz49NuYqSEDxcSxW mUwQ== 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=WltgY+ioPBVaA4MSIqyW/3VPytavaaSl8us8SORoE0o=; b=GNRHDZ0K/S9fNACazDmF7ugMEZ4yzsF+/yN4gJVzMP30lIGbjX6MauQcbsc9e8Pe8n 3WvCtbEEFDgO9bsNirJtGi7AKU6aP33y13JOAN8WbHJUsS6TDTdTQ3IsWLbXnDz94Oh6 tDaSs1TE4oOlIvEURMkqrS7CZJHCkMC0TZ9q+azb8laNWgnrXVGbV8NQevTOOVylaaGZ R/A1Xi42SehbXZbKiyzrpInvgzMKKQ8vy2W3dyuBJdroyyh1mwFVH2MEppziBOBVBejz 46+oKJCp7Uj5cloTcEx4sSWpxxD/UkSsEIa6bdHck8fOSwHIBBMokhBGQyR7kI5wbd1k UWQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="X6v5/fzW"; 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 u15-v6si507156qta.385.2018.07.13.05.24.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 13 Jul 2018 05:24:42 -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="X6v5/fzW"; 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]:36989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx7p-0000gx-KZ for patch@linaro.org; Fri, 13 Jul 2018 08:24:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1F-0004n3-D5 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1E-0003nn-CV for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:53 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:40948) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1E-0003mj-5f for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:52 -0400 Received: by mail-wr1-x434.google.com with SMTP id t6-v6so24912507wrn.7 for ; Fri, 13 Jul 2018 05:17:52 -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=WltgY+ioPBVaA4MSIqyW/3VPytavaaSl8us8SORoE0o=; b=X6v5/fzWMpS7NnOYpBma38LouI2O9/EjUarMo28PauEGNpBxGW7xZ2Wyd7bsM6Bjp1 cZv5wGOYVjI+ijS6g5ylGH+zxdIEdiyxNN8tapCPYTwlOqFAT5mEjOtZgUY8Kx7NP4pW YxJO/+ViQk52Eaq+l4zYUHGVbl5YyOJvpESUw= 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=WltgY+ioPBVaA4MSIqyW/3VPytavaaSl8us8SORoE0o=; b=Y81ZFiFlcItr4tjMxAxv2KBS9V31fOB5h94riQ9nBovoYcPILjh6sB+COTaBjKjt/F BjPK6eU8M0GPES9Y/1Jn0QhUXsb5MshmDpXTPrO0fBLv0ed59XdCxQO9SOgwNy/YBcFt QjpKqtYKV+EB3/Bd8+lZle5MVw3cFNIEyUPVMuA8sAgp9imiLoNOHgnS5I3jjpqMuAsf rU5aYUjc2bEJSpPV5tmXEnXx9f/WBphUiwYjTek/pCcDd4w8r6BXr6wjZrJZm8KRm3cx J+bd0NWQLZjgWryHZwxttN9gZ16JlZfptgLb3P5XVElpMWHjTUieFn4hOHKgtD3IU7HL +aiw== X-Gm-Message-State: AOUpUlE0A11nzdSWWYNSCeH65xwUAyvK7fQlctrEWZ49pdZiXviOTRpm 2AEpIwjaD/KrtUdvsvAQnRZEqQ== X-Received: by 2002:adf:91e5:: with SMTP id 92-v6mr4252064wri.124.1531484271189; Fri, 13 Jul 2018 05:17:51 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l6-v6sm5253739wmh.41.2018.07.13.05.17.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:48 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EDD793E08B3; Fri, 13 Jul 2018 13:17:42 +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: Fri, 13 Jul 2018 13:17:38 +0100 Message-Id: <20180713121741.19262-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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:4864:20::434 Subject: [Qemu-devel] [PATCH v2 for 3.0 13/16] 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 --- tests/docker/Makefile.include | 3 ++- tests/docker/docker.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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":