From patchwork Sat Jul 8 07:47:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 9831417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A5B65602BD for ; Sat, 8 Jul 2017 07:50:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98BB82853B for ; Sat, 8 Jul 2017 07:50:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D91628549; Sat, 8 Jul 2017 07:50:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 043E62853B for ; Sat, 8 Jul 2017 07:50:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTkTN-0000IL-HK; Sat, 08 Jul 2017 07:48:13 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTkTM-0000EA-MV for xen-devel@lists.xenproject.org; Sat, 08 Jul 2017 07:48:12 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 4F/E5-20252-B3E80695; Sat, 08 Jul 2017 07:48:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRWlGSWpSXmKPExsXitHSDva51X0K kwbkVIhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bprpCC4zIVE//+YGlg3CbaxcjJISHgL7H7 /Hl2EJtNQEfi4tydbF2MHBwiAioSt/cagISZBdwl7lxYxAQSFhbwkGjbpQQSZgGquHV5MhuIz StgJTH/6ks2iIl6Em8nvmAEsTmB4jennGQBsYUELCVO7dnCBFEvKHFy5hMWiPGaEq3bf7ND2P ISzVtnM0PUK0r0z3vANoGRbxaSlllIWmYhaVnAyLyKUaM4tagstUjX0EAvqSgzPaMkNzEzB8g z08tNLS5OTE/NSUwq1kvOz93ECAwzBiDYwXhvWcAhRkkOJiVRXrHehEghvqT8lMqMxOKM+KLS nNTiQ4wyHBxKEry/eoBygkWp6akVaZk5wICHSUtw8CiJ8D7RAUrzFhck5hZnpkOkTjEac2xYv f4LE8erCf+/MQmx5OXnpUqJ864GmSQAUppRmgc3CBaJlxhlpYR5GYFOE+IpSC3KzSxBlX/FKM 7BqCTMywlyK09mXgncvldApzABncJWB3ZKSSJCSqqBUXlfZ4/d5pAjLHL5GW9WmjKJOemJvfg vvVHd5esrrXunGnY+mv2ek4czfuGTZQ8P+0n65oad9mFdEbV534T7iw7NXrnSy8Fg/dqif5+9 8hOu+Ry6vfxRwqxJVxijGuycGEQCPiVUJSuuOxlvdvtcYXxL6q7Px+Vf28jOCsr6GbxmrUP1Y 06On0osxRmJhlrMRcWJAF5snTi/AgAA X-Env-Sender: prvs=355d1c376=roger.pau@citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1499500085!65637292!4 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21447 invoked from network); 8 Jul 2017 07:48:11 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Jul 2017 07:48:11 -0000 X-IronPort-AV: E=Sophos;i="5.40,327,1496102400"; d="scan'208";a="439202918" From: Roger Pau Monne To: Date: Sat, 8 Jul 2017 08:47:09 +0100 Message-ID: <20170708074712.44451-15-roger.pau@citrix.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <20170708074712.44451-1-roger.pau@citrix.com> References: <20170708074712.44451-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Ian.Jackson@eu.citrix.com, Roger Pau Monne Subject: [Xen-devel] [PATCH v5 14/17] osstest: change the meaning of need_build_host X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Make need_build_host store a string instead of a boolean. This is later going to be expanded to handle the FreeBSD build jobs. Signed-off-by: Roger Pau Monné --- Changes since v4: - Fix the usage of the catching-otherwise blocks. Changes since v3: - New in this version (split from patch). --- sg-run-job | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/sg-run-job b/sg-run-job index b1f94f4d..65e0a834 100755 --- a/sg-run-job +++ b/sg-run-job @@ -52,12 +52,12 @@ proc run-job {job} { set skip_globs [jobdb::read-runvar $flight $job skip_testids] set nh [need-hosts/$jobinfo(recipe)] - if {![string compare $nh BUILD]} { + if {[string match BUILD_* $nh]} { set need_xen_hosts {} - set need_build_host 1 + set need_build_host [string range $nh [expr [string first _ $nh] + 1] end] } else { set need_xen_hosts $nh - set need_build_host 0 + set need_build_host {} } set nested_layers_hosts {} @@ -68,7 +68,9 @@ proc run-job {job} { eval run-ts broken = ts-hosts-allocate + $need_xen_hosts } - if {$need_build_host} { catching-otherwise broken allocate-build-host } + if {[llength $need_build_host]} { + catching-otherwise broken { allocate-build-host $need_build_host } + } if {$ok} { setstatus running } @@ -77,7 +79,11 @@ proc run-job {job} { if {$ok} { set syslog [spawn-ts broken = | ts-syslog-server] } - if {$need_build_host} { catching-otherwise broken prepare-build-host } + if {[llength $need_build_host]} { + catching-otherwise broken { + prepare-build-host-[string tolower $need_build_host] + } + } per-host-ts broken host-install/@(*) ts-host-install-twice @@ -95,7 +101,7 @@ proc run-job {job} { set need_xen_hosts [lunappend nested_layers_hosts] } - if {$need_build_host && !$ok} { + if {[llength $need_build_host] && !$ok} { run-ts !broken capture-logs ts-logs-capture + host } @@ -116,7 +122,7 @@ proc run-job {job} { if {$ok} { setstatus pass } - if {$need_build_host && $ok} { jobdb::preserve-task 90 } + if {[llength $need_build_host] && $ok} { jobdb::preserve-task 90 } if {!$ok} { jobdb::logputs stdout "job not ok" @@ -671,11 +677,11 @@ proc need-hosts/host-examine-linux {} { examine-host-examine debian } #---------- builds ---------- -proc need-hosts/build {} { return BUILD } -proc need-hosts/build-kern {} { return BUILD } -proc need-hosts/build-libvirt {} { return BUILD } -proc need-hosts/build-rumprun {} { return BUILD } -proc need-hosts/build-xtf {} { return BUILD } +proc need-hosts/build {} { return BUILD_LINUX } +proc need-hosts/build-kern {} { return BUILD_LINUX } +proc need-hosts/build-libvirt {} { return BUILD_LINUX } +proc need-hosts/build-rumprun {} { return BUILD_LINUX } +proc need-hosts/build-xtf {} { return BUILD_LINUX } proc run-job/build {} { run-ts . = ts-xen-build @@ -702,11 +708,11 @@ proc run-job/build-xtf {} { run-ts . = ts-xtf-build } -proc allocate-build-host {} { +proc allocate-build-host {ostype} { global jobinfo run-ts broken = ts-hosts-allocate + host } -proc prepare-build-host {} { +proc prepare-build-host-linux {} { global jobinfo run-ts broken host-install(*) ts-host-install-twice run-ts . host-build-prep ts-xen-build-prep