From: Ian Jackson <iwj@xenproject.org>
Date: Wed, 21 Oct 2020 17:38:51 +0000 (+0100)
Subject: host reuse fixes: Fix runvar entry for adhoc tasks
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d47c1bca904c9f70f66b0ee789c05f20018386da;p=osstest.git

host reuse fixes: Fix runvar entry for adhoc tasks

When processing an item from the host lifecycle table into the runvar,
we don't want to do all the processing of flight and job.  Instead, we
should simply put the ?<taskid> into the runvar.

Previously this would produce ?<taskid>: which the flight reporting
code would choke on.

Signed-off-by: Ian Jackson <iwj@xenproject.org>
---

diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index 0455511..1dcf55f 100644
--- a/Osstest/JobDB/Executive.pm
+++ b/Osstest/JobDB/Executive.pm
@@ -649,6 +649,11 @@ END
 	    }
 	    next if $tj_seen{$oisprepmark.$otj}++;
 
+	    if (!defined $o->{flight}) {
+		push @lifecycle, "$omarks$otj";
+		next;
+	    }
+
 	    if (!$omarks && !$olive && defined($o->{flight}) &&
 		$ho->{Shared} &&
 		$ho->{Shared}{Type} =~ m/^build-/ &&