[OSSTEST PATCH] cr-daily-branch: Sort out retest build reuse

Ian Jackson posted 1 patch 2 weeks, 1 day ago
Failed in applying to current master (apply log)
cr-daily-branch | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

[OSSTEST PATCH] cr-daily-branch: Sort out retest build reuse

Posted by Ian Jackson 2 weeks, 1 day ago
Retest flights ought to reuse precisely the builds from the flight
which prompts the retests.

mg-adjust-flight-makexrefs is the wrong tool for this job.  It can
often leave the retry flights with no build jobs and no references to
the main flights' build jobs, so the results are just broken jobs.

Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
 cr-daily-branch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cr-daily-branch b/cr-daily-branch
index e54ca227..6ec3aa62 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -529,9 +529,8 @@ END
 			$retry_jobs
 	)
 
-	./mg-adjust-flight-makexrefs -v $rflight \
-		--branch=$branch --revision-osstest=$narness_rev \
-		'^build-*' --debug --blessings=real
+	./cs-adjust-flight -D $rflight \
+			runvar-build-set . . "^$rflight\\." $flight.
 
 	if [ "${OSSTEST_SIMULATE_FAIL_RETRY+y}" = y ]; then
 		export OSSTEST_SIMULATE_FAIL="${OSSTEST_SIMULATE_FAIL_RETRY}"
-- 
2.20.1