|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [OSSTEST PATCH 47/82] shared/reuse: Use @ for ts-host-install
From: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Pass @ from sg-run-job. These are all the call sites for
ts-host-install-*, so we can lose the open-coded test for SharedReady.
Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
sg-run-job | 6 +++---
ts-host-install | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sg-run-job b/sg-run-job
index d46a3a62..c454d4ea 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -85,7 +85,7 @@ proc run-job {job} {
}
}
- per-host-ts broken host-install/@(*) ts-host-install-twice
+ per-host-ts @broken host-install/@(*) ts-host-install-twice
per-host-prep
@@ -675,7 +675,7 @@ proc examine-host-prep {} {
run-ts broken = ts-hosts-allocate + host
}
proc examine-host-install-debian {} {
- run-ts broken host-install ts-host-install-twice + host
+ run-ts broken host-install ts-host-install-twice + @host
}
proc examine-host-install-xen {} {
examine-host-install-debian
@@ -752,7 +752,7 @@ proc allocate-build-host {ostype} {
}
proc prepare-build-host-linux {} {
global jobinfo
- run-ts broken host-install(*) ts-host-install-twice + --build
+ run-ts broken host-install(*) ts-host-install-twice + --build @host
run-ts . host-build-prep ts-xen-build-prep + @host
}
diff --git a/ts-host-install b/ts-host-install
index 924c1e06..b0fd2028 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -53,7 +53,6 @@ our ($whhost) = @ARGV;
$whhost ||= 'host';
our $ho= selecthost($whhost);
exit 0 if $ho->{Flags}{'no-reinstall'};
-exit 0 if $ho->{SharedReady};
our %timeout= qw(ReadPreseed 350
Sshd 2400);
--
2.20.1
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |