From patchwork Thu Oct 1 16:24:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11811865 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3A6AA139A for ; Thu, 1 Oct 2020 16:25:44 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 15E9520759 for ; Thu, 1 Oct 2020 16:25:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 15E9520759 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.1455.4581 (Exim 4.92) (envelope-from ) id 1kO1O4-0001Lt-EP; Thu, 01 Oct 2020 16:24:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1455.4581; Thu, 01 Oct 2020 16:24:56 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kO1O4-0001Lm-AW; Thu, 01 Oct 2020 16:24:56 +0000 Received: by outflank-mailman (input) for mailman id 1455; Thu, 01 Oct 2020 16:24:55 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kO1O3-0001JL-JR for xen-devel@lists.xenproject.org; Thu, 01 Oct 2020 16:24:55 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 57916f4e-c27c-453e-bc92-0bb81ac20b09; Thu, 01 Oct 2020 16:24:50 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kO1Nx-00029L-Cc; Thu, 01 Oct 2020 17:24:49 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kO1O3-0001JL-JR for xen-devel@lists.xenproject.org; Thu, 01 Oct 2020 16:24:55 +0000 X-Inumbo-ID: 57916f4e-c27c-453e-bc92-0bb81ac20b09 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 57916f4e-c27c-453e-bc92-0bb81ac20b09; Thu, 01 Oct 2020 16:24:50 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kO1Nx-00029L-Cc; Thu, 01 Oct 2020 17:24:49 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 3/8] sg-run-job: Preserve step state "fail" if set by test script Date: Thu, 1 Oct 2020 17:24:34 +0100 Message-Id: <20201001162439.18160-3-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201001162439.18160-1-iwj@xenproject.org> References: <20201001162439.18160-1-iwj@xenproject.org> MIME-Version: 1.0 If the test script exits nonzero but after setting the step status to 'fail', we can leave it that way. This is particularly relevant if the iffail in the job spec says 'broken' or something. After this change, a step can decide to override that. An alternative would be to have the step script exit zero, but of course that would (generally) leave the job to continue running more steps! Signed-off-by: Ian Jackson --- tcl/JobDB-Executive.tcl | 1 + 1 file changed, 1 insertion(+) diff --git a/tcl/JobDB-Executive.tcl b/tcl/JobDB-Executive.tcl index 4fe85696..38248823 100644 --- a/tcl/JobDB-Executive.tcl +++ b/tcl/JobDB-Executive.tcl @@ -325,6 +325,7 @@ proc step-set-status {flight job stepno st} { AND status<>'aborted' AND status<>'broken' AND status<>'starved' + AND status<>'fail' " set pause 0 db-execute-array stopinfo "