[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [OSSTEST PATCH 11/22] sg-run-job: Break out per-host-prep and per-host-finish
No functional change. We now call the per-host-ts finish steps unconditionally, rather than only if !$need_build_host, per-host-ts is (complicated) no-op if $need_build_host, since in that case $need_xen_hosts is {}. Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> Tested by: Robert Ho <robert.hu@xxxxxxxxx> --- v14: Squash typo fix from Robert into this patch --- sg-run-job | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/sg-run-job b/sg-run-job index 66145b8..884a21d 100755 --- a/sg-run-job +++ b/sg-run-job @@ -23,6 +23,20 @@ source ./tcl/osstestlib.tcl readconfig source-method JobDB +proc per-host-prep {} { + per-host-ts . host-ping-check-native/@ ts-host-ping-check + per-host-ts . xen-install/@ ts-xen-install + per-host-ts . xen-boot/@ ts-host-reboot + + per-host-ts . host-ping-check-xen/@ ts-host-ping-check + per-host-ts . =(*) {ts-leak-check basis} +} + +proc per-host-finish {} { + per-host-ts . = {ts-leak-check check} + per-host-ts !broken capture-logs/@(*) ts-logs-capture +} + proc run-job {job} { global jobinfo builds flight ok need_xen_hosts anyfailed @@ -51,22 +65,15 @@ proc run-job {job} { if {$ok} { setstatus running } per-host-ts broken host-install/@(*) ts-host-install-twice - per-host-ts . host-ping-check-native/@ ts-host-ping-check - per-host-ts . xen-install/@ ts-xen-install - per-host-ts . xen-boot/@ ts-host-reboot - per-host-ts . host-ping-check-xen/@ ts-host-ping-check - per-host-ts . =(*) {ts-leak-check basis} + per-host-prep if {$ok} { catching-otherwise fail run-job/$jobinfo(recipe) } - per-host-ts . = {ts-leak-check check} - if {!$need_build_host} { - per-host-ts !broken capture-logs/@(*) ts-logs-capture - } else { - if {$anyfailed} { - run-ts !broken capture-logs ts-logs-capture + host - } + per-host-finish + + if {$need_build_host && $anyfailed} { + run-ts !broken capture-logs ts-logs-capture + host } if {$ok} { setstatus pass } -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |