[OSSTEST PATCH 1/3] mg-repro-setup: Cope with flights referencing other builds

[OSSTEST PATCH 1/3] mg-repro-setup: Cope with flights referencing other builds

[Ian Jackson]

We attempted to do this by trying to adjust build runvars only if they
didn't have a `.'.  But cs-adjust-flight runvar-build-set has special
handling for <old-value>: it is always qualified with the flight.

So change the match to look for the current flight number.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 mg-repro-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mg-repro-setup b/mg-repro-setup
index 0b3137a..4f2fe54 100755
--- a/mg-repro-setup
+++ b/mg-repro-setup
@@ -199,7 +199,7 @@ if $skipcapture; then adjrunvar skip_testids "capture-logs*"; fi
 
 ./cs-adjust-flight $flight						\
 	copy-jobs $example_flight $job					\
-	runvar-build-set . '/buildjob$' '^[^\.]+$' $example_flight	\
+	runvar-build-set . '/buildjob$' "^$flight\\." $example_flight \
 	"${adjusts[@]}"
 
 progress "executing ..."
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[OSSTEST PATCH 2/3] proxy config: Actually set https_proxy too

[Ian Jackson]

05406e5aaffb "proxy config: Set https_proxy too" was ineffective
because in d22b80bb "proxy config: Factor out http_proxy_envsettings"
the variable name $var was not substituted into the new
supposedly-more-general shell rune, which consequently lacked the
appropriate generality.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/TestSupport.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index d482e1d..19bdd23 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1911,7 +1911,7 @@ sub http_proxy_envsettings ($) {
     return unless $proxy;
     my @script;
     foreach my $var (qw(http_proxy https_proxy)) {
-        push @script, "http_proxy=$proxy", "export http_proxy";
+        push @script, "$var=$proxy", "export $var";
     }
     return (join '; ', @script).';';
 }
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[OSSTEST PATCH 3/3] mg-hosts: -l: print subtask info too

[Ian Jackson]

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 mg-allocate | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mg-allocate b/mg-allocate
index 2dfbdb1..4f02ce5 100755
--- a/mg-allocate
+++ b/mg-allocate
@@ -612,13 +612,19 @@ END
 			      qw(restype resname shareix));
 	    my $restype = $c->{restype};
 	    my $resname = $c->{resname};
+            my $prshare;
 	    if ($restype eq 'share-host') {
-		print "S/$resname";
+		$prshare = "S/$resname";
 	    } elsif ($restype eq 'host') {
-		print "$resname";
+		$prshare = "$resname";
 	    } elsif ($restype eq 'share-flight') {
-		print "F/$resname";
+		$prshare = "F/$resname";
 	    }
+            if ($c->{subtask}) {
+                printf "%-20s  %s", $prshare, $c->{subtask};
+            } else {
+                print $prshare;
+            }
 	    print "\n";
 	}
         db_retry_abort();
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel