]> xenbits.xensource.com Git - people/aperard/osstest.git/commitdiff
mg-repro-setup: Cope with flights referencing other builds
authorIan Jackson <ian.jackson@eu.citrix.com>
Tue, 25 Apr 2017 13:17:45 +0000 (13:17 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 25 Apr 2017 15:10:37 +0000 (16:10 +0100)
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

index 0b3137a176485b3cb87e3ceca5c9a695ffbcd3b4..4f2fe54ec6a9ccb858e24572834310e94bcdde9a 100755 (executable)
@@ -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 ..."