From patchwork Thu Nov 10 02:14:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1701964 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=G0+fD602; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N758P1CClz23lT for ; Thu, 10 Nov 2022 13:17:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A8B8285110; Thu, 10 Nov 2022 03:17:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="G0+fD602"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A750080FB5; Thu, 10 Nov 2022 03:16:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9D6098510B for ; Thu, 10 Nov 2022 03:16:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2c.google.com with SMTP id s10so294069ioa.5 for ; Wed, 09 Nov 2022 18:16:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gsjakJlKmlfuy0iQRNFJXoLNF70isz7UcVPf4ITswsg=; b=G0+fD60205ZAVJgNN4x9ccR6tRjJAlZAFAuXqGL4FI3Shn3BRlSdZiKIB6u3WEi+86 H9enyLlXT6I7oHAC6O19WLQyWTQ+iqSFhkVqNxhp43M9kG7v/fSQUu8KP+M1brvlnbhC 9iXu/mQ1G66qmv9avl6lCYIahxR64z+jSy+iQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gsjakJlKmlfuy0iQRNFJXoLNF70isz7UcVPf4ITswsg=; b=EZGCAJXvSXgODDbwmBiq1Xqfj8XPp1R1Yq2L31OUh2ugXveWZd/cs1acOyuzKWO53G bqlS2rMLisVJ2nTWB0IYH/7g12U5qWRLPldCi9mS2wyCcafk5qVOjKuXaQnT0nscOpK4 KTV9TcEjgM5zv2d9Jbye8wHEei0/sEngJ1A5zOEyL+SCm/nGipwThrDMjYgMKoZo08rR GRIx2DSlsN8Oj96lFQ25rsTCMF0F95ZHH/XPkny6RpNvooWP1Q6N3oyH4MeaLh91l+jv UYAetjr7Z20PTaH06cPzAfYDWhqtmOGgJ4Z3OFmuZkBU0pspLH7lUtQs2XahEwD+hkIY Eu4A== X-Gm-Message-State: ACrzQf1FhzgpCc20GEgq9iNnrLPRrHJMxL0k4s8miH9xesSf3kQhlDFG dseENUsIAafFn8Y7Eu4mXKflgfbotjEToA== X-Google-Smtp-Source: AMsMyM4wHcXbvcBu6095hk4S3MPoeJzc+ix7ZvHxTvCYZKZh9CtBe8vMpN73geF+lAsj9JPcMRZuXA== X-Received: by 2002:a05:6638:4519:b0:372:c7f1:425b with SMTP id bs25-20020a056638451900b00372c7f1425bmr34104394jab.106.1668046569509; Wed, 09 Nov 2022 18:16:09 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id z23-20020a056638215700b003636b73cf29sm5352785jaj.8.2022.11.09.18.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 18:16:09 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Rasmus Villemoes , Simon Glass Subject: [PATCH v5 10/16] buildman: Detect binman reporting missing blobs Date: Wed, 9 Nov 2022 19:14:48 -0700 Message-Id: <20221110021455.1004335-11-sjg@chromium.org> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog In-Reply-To: <20221110021455.1004335-1-sjg@chromium.org> References: <20221110021455.1004335-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Buildman should consider a build as a success (with warnings) if missing blobs have been dealt with by binman, even though buildman itself returns and error code overall. This is how other warnings are dealt with. We cannot easily access the 103 exit code, so detect the problem in the output. With this change, missing blobs result in an exit code of 101, although they still indicate failure. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- (no changes since v1) tools/buildman/builderthread.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index 6240e08c767..065d836d68c 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -288,10 +288,14 @@ class BuilderThread(threading.Thread): args.append('cfg') result = self.Make(commit, brd, 'build', cwd, *args, env=env) + if (result.return_code == 2 and + ('Some images are invalid' in result.stderr)): + # This is handled later by the check for output in + # stderr + result.return_code = 0 if adjust_cfg: errs = cfgutil.check_cfg_file(cfg_file, adjust_cfg) if errs: - print('errs', errs) result.stderr += errs result.return_code = 1 result.stderr = result.stderr.replace(src_dir + '/', '')