Re: [OSSTEST PATCH 3/4] sg-run-job: Break out per-host-prep and per-host-finish

[Robert Hu <robert.hu@vmm.sh.intel.com>]

On Tue, 2015-06-30 at 17:36 +0100, Ian Jackson wrote:
> 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@eu.citrix.com>
> ---
>  sg-run-job |   31 +++++++++++++++++++------------
>  1 file changed, 19 insertions(+), 12 deletions(-)
> 
> diff --git a/sg-run-job b/sg-run-job
> index 33a836b..312b0d7 100755
> --- a/sg-run-job
> +++ b/sg-run-job
> @@ -24,6 +24,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
>  
> @@ -52,22 +66,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-hosts-prep
a trivial typo, I think 'per-host-prep' shall be.
>  
>      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                                             }