From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78CC3C433DF for ; Thu, 15 Oct 2020 15:51:03 +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 EFD2B22254 for ; Thu, 15 Oct 2020 15:51:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=xenproject.org header.i=@xenproject.org header.b="g11WSl3P" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EFD2B22254 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.7522.19742 (Exim 4.92) (envelope-from ) id 1kT5Wl-0006lF-NU; Thu, 15 Oct 2020 15:50:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 7522.19742; Thu, 15 Oct 2020 15:50:51 +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 1kT5Wl-0006l1-Hp; Thu, 15 Oct 2020 15:50:51 +0000 Received: by outflank-mailman (input) for mailman id 7522; Thu, 15 Oct 2020 15:50:49 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kT5Wj-0006GR-RP for xen-devel@lists.xenproject.org; Thu, 15 Oct 2020 15:50:49 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id d6d92408-c0d2-446a-afef-747eb7d61167; Thu, 15 Oct 2020 15:50:30 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kT5WP-000888-Vc for xen-devel@lists.xenproject.org; Thu, 15 Oct 2020 15:50:29 +0000 Received: from iwj (helo=mynotebook.example.org) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1kT5WP-0005GM-Um for xen-devel@lists.xenproject.org; Thu, 15 Oct 2020 15:50:29 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1kT5WO-0000oB-91; Thu, 15 Oct 2020 16:50:28 +0100 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kT5Wj-0006GR-RP for xen-devel@lists.xenproject.org; Thu, 15 Oct 2020 15:50:49 +0000 X-Inumbo-ID: d6d92408-c0d2-446a-afef-747eb7d61167 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id d6d92408-c0d2-446a-afef-747eb7d61167; Thu, 15 Oct 2020 15:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=e3H0s2+WzQtNrHrJPYnYMyg0OSRyEJNxDWc8yLBsrEc=; b=g11WSl3PbOg704AUjUeAfnRHnt 55RaGFyjVc6ODZWVVFOrP0uH3pNZO5YUsLfMDZhZBfeZPVK+4IhEfJUxO6kPNL//a0o1kpCi+EN6H 436yHTfkTvRU+Kvapj38GQ2sNfniIWIMlYahKdMNIjnKL34qnQdMe6By+gh+IneR7cpA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kT5WP-000888-Vc for xen-devel@lists.xenproject.org; Thu, 15 Oct 2020 15:50:29 +0000 Received: from iwj (helo=mynotebook.example.org) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1kT5WP-0005GM-Um for xen-devel@lists.xenproject.org; Thu, 15 Oct 2020 15:50:29 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1kT5WO-0000oB-91; Thu, 15 Oct 2020 16:50:28 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH v2 07/17] cri-args-hostlists: Break out report_flight and publish_logs Date: Thu, 15 Oct 2020 16:50:09 +0100 Message-Id: <20201015155019.20705-8-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201015155019.20705-1-iwj@xenproject.org> References: <20201015155019.20705-1-iwj@xenproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ian Jackson NFC. Signed-off-by: Ian Jackson --- cri-args-hostlists | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/cri-args-hostlists b/cri-args-hostlists index 7019c0c7..52e39f33 100644 --- a/cri-args-hostlists +++ b/cri-args-hostlists @@ -128,10 +128,7 @@ start_email () { date >&2 - ./sg-report-flight --report-processing-start-time \ - --html-dir=$flight_html_dir/$flight/ \ - --allow=allow.all --allow=allow.$branch \ - $sgr_args $flight >tmp/$flight.report + report_flight $flight ./cr-fold-long-lines tmp/$flight.report date >&2 @@ -144,11 +141,23 @@ start_email () { date >&2 } +report_flight () { + local flight=$1 + ./sg-report-flight --html-dir=$flight_html_dir/$flight/ \ + --allow=allow.all --allow=allow.$branch \ + $sgr_args $flight >tmp/$flight.report +} + +publish_logs () { + local flight=$1 + ./cr-publish-flight-logs ${OSSTEST_PUSH_HARNESS- --push-harness} \ + $flight >&2 +} + publish_send_email () { local flight=$1 + publish_logs $flight exec >&2 - ./cr-publish-flight-logs ${OSSTEST_PUSH_HARNESS- --push-harness} \ - $flight send_email tmp/$flight.email } -- 2.20.1