From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 6/6] sg-run-job: Do blocked check globally, in run-job Date: Wed, 21 May 2014 12:42:08 +0100 Message-ID: <1400672528-16185-6-git-send-email-ian.jackson@eu.citrix.com> References: <1400672528-16185-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wn4wj-0007Ki-VC for xen-devel@lists.xenproject.org; Wed, 21 May 2014 11:44:34 +0000 In-Reply-To: <1400672528-16185-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org Only run-job can fully abandon the whole job. With the previous arrangements (in bc63a901), a blocked build job would go on to try to run ts-logs-capture and become broken (rather than blocked). The downside of this is that it is not possible in the future to introduce a kind of job which can selectively carry on if some of its dependencies fail. This notion is IMO an acceptable casualty. Signed-off-by: Ian Jackson --- sg-run-job | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sg-run-job b/sg-run-job index c1dfa86..e903869 100755 --- a/sg-run-job +++ b/sg-run-job @@ -39,9 +39,10 @@ proc run-job {job} { set need_build_host 0 } + catching-otherwise blocked check-not-blocked + if {!$ok} return + if {[llength $need_xen_hosts]} { - catching-otherwise blocked check-not-blocked - if {!$ok} return eval run-ts broken = ts-hosts-allocate + $need_xen_hosts } @@ -340,9 +341,7 @@ proc run-job/build-rumpuserxen {} { } proc prepare-build-host {} { - global jobinfo ok - catching-otherwise blocked check-not-blocked - if {!$ok} return + global jobinfo run-ts broken = ts-hosts-allocate + host run-ts broken host-install(*) ts-host-install-twice run-ts . host-build-prep ts-xen-build-prep -- 1.7.10.4