[OSSTEST PATCH 1/2] ts-host-install: Fix indentation error

[OSSTEST PATCH 1/2] ts-host-install: Fix indentation error

[Ian Jackson]

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 ts-host-install |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts-host-install b/ts-host-install
index b13f293..dfee932 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -34,7 +34,7 @@ while (@ARGV and $ARGV[0] =~ m/^-/) {
     $_= shift @ARGV;
     last if m/^--$/;
     if (m/^--priority(?:=(.*))?$/) {
-    $xopts{DebconfPriority}= defined($1) ? $1 : 'low';
+        $xopts{DebconfPriority}= defined($1) ? $1 : 'low';
     } elsif  (m/^--rescue$/) {
 	$xopts{RescueMode}= 1;
     }
-- 
1.7.10.4

[OSSTEST PATCH 2/2] ts-host-install: New --poweron-test-only option

[Ian Jackson]

We are having a difficulty with one of the test boxes, which can be
most easily reproduced by running ts-host-install to power cycle the
box and then see if it wakes up enough to fetch a preseed file.

Keep this mode of operation in tree in case it's useful in future.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 ts-host-install |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ts-host-install b/ts-host-install
index dfee932..69de4b6 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -27,6 +27,7 @@ use Osstest::Logtailer;
 tsreadconfig();
 
 my $debconf_priority;
+my $poweron_test_only;
 
 our %xopts;
 
@@ -35,6 +36,8 @@ while (@ARGV and $ARGV[0] =~ m/^-/) {
     last if m/^--$/;
     if (m/^--priority(?:=(.*))?$/) {
         $xopts{DebconfPriority}= defined($1) ? $1 : 'low';
+    } elsif  (m/^--poweron-test-only$/) {
+	$poweron_test_only= 1;
     } elsif  (m/^--rescue$/) {
 	$xopts{RescueMode}= 1;
     }
@@ -71,6 +74,13 @@ END
     await_webspace_fetch_byleaf(get_timeout($ho,'reboot',$timeout{ReadPreseed})
                                 , 1,
                                 $logtailer, $ho, $ps_url);
+
+    if ($poweron_test_only) {
+	logm("Hooray, power on worked.");
+	power_state($ho, 0);
+	exit 0;
+    }
+
     setup_pxeboot_local($ho);
 
     await_tcp(get_timeout($ho,'reboot',$timeout{Sshd}), 14,$ho);
-- 
1.7.10.4

Re: [OSSTEST PATCH 2/2] ts-host-install: New --poweron-test-only option

[Ian Campbell]

On Fri, 2015-05-15 at 18:14 +0100, Ian Jackson wrote:
> We are having a difficulty with one of the test boxes, which can be
> most easily reproduced by running ts-host-install to power cycle the
> box and then see if it wakes up enough to fetch a preseed file.
> 
> Keep this mode of operation in tree in case it's useful in future.
> 
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

Both patches: Acked-by: Ian Campbell <ian.campbell@citrix.com>