[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [OSSTEST RFC 14/16] sg-run-job: Select host install script based on all_host_os runvar



This also select a different xen installation script.

Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
 sg-run-job | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/sg-run-job b/sg-run-job
index f6e8340..b324101 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -25,8 +25,9 @@ readconfig
 source-method JobDB
 
 proc per-host-prep {} {
+    global ts_xen_install
     per-host-ts .       host-ping-check-native/@ ts-host-ping-check
-    per-host-ts .       xen-install/@     ts-xen-install
+    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
@@ -42,6 +43,7 @@ proc per-host-finish {} {
 proc run-job {job} {
     global jobinfo builds flight ok truncate need_xen_hosts
     global nested_layers_hosts truncate_globs skip_globs anyskipped
+    global ts_xen_install
 
     set ok 1
     set truncate 0
@@ -84,7 +86,17 @@ proc run-job {job} {
         }
     }
 
-    per-host-ts broken  host-install/@(*) ts-host-install-twice
+    switch -exact [jobdb::read-runvar $flight $job all_host_os] {
+        centos {
+          set ts_host_install ts-centos-host-install
+          set ts_xen_install  ts-centos-xen-pkg-install
+        }
+        default {
+          set ts_host_install ts-host-install-twice
+          set ts_xen_install  ts-xen-install
+        }
+    }
+    per-host-ts broken  host-install/@(*) $ts_host_install
 
     per-host-prep
 
-- 
Anthony PERARD


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.