sg-run-job: hook the memdisk test into examine

Hook the memdisk parameter detection and the saving of the host
properties into the examine jobs.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Changes since v2:
 - Do not pass a host ident to ts-examine-hostprops-save.
 - Use .- for ts-memdisk-try-append so that the rest of the job will
   run even if this step fails.

Changes since v1:
 - Run the memdisk test first (so that we don't leave the host in a
   weird state).
 - Pass a host to the examine-hostprops-save.

diff --git a/sg-run-job b/sg-run-job
index 05629535b32159879381c978ad0fffaa760257cc..537d6b8068607026a529550e8397e7c408dfee6b 100755 (executable)
--- a/sg-run-job
+++ b/sg-run-job
@@ -650,6 +650,7 @@ proc examine-host-install-xen {} {
 proc examine-host-examine {install} {
     global ok
     catching-otherwise fail {
+       run-ts -.  =            ts-memdisk-try-append + host
        examine-host-install-$install
        run-ts .   =            ts-examine-serial-pre + host
        run-ts .   reboot       ts-host-reboot        + host
@@ -658,6 +659,7 @@ proc examine-host-examine {install} {
     if {$ok} {
        run-ts -.  =           ts-examine-serial-post + host
        run-ts .   =           ts-examine-logs-save   + host
+       run-ts .   =           ts-examine-hostprops-save
     }
 }