cr-daily-branch: Sort out retest build reuse

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>

diff --git a/cr-daily-branch b/cr-daily-branch
index e54ca227d9f8abc6464847d928a7c8f8e1d07300..6ec3aa623d51d2d500be33da1b553950e38ce68b 100755 (executable)
--- 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}"