cr-daily-branch: Use mg-adjust-flight-makexrefs to have smoke tests reuse builds

The smoke tests are for testing xen-unstable.  We want to avoid
building anything else.  So arrange to reuse previous builds by
calling mg-adjust-flight-makexrefs.

We rebuild libvirt too.  This is necessary because libvirt is built
against xen.git, and uses ABI-unstable APIs, so we need a libvirt
built against the right xen.git.  This means, for the smoke tests, we
need to build libvirt ourselves.  Currently this build seems to take
416 sends (from host allocation, which we - perhaps naively - hope
will be able to reuse the host from the just-finished build job).

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v4: Keep build-amd64-libvirt too.
v3: Add a comment about the --blessings=real
v2: New patch

diff --git a/cr-daily-branch b/cr-daily-branch
index 141bce50e083cbe8d49fe27b3d3637d8862eafee..dd9c30aecefc053711b0cdaacb1eb6bd5464e99a 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -276,7 +276,19 @@ if [ "x$NEW_REVISION" = "x$OLD_REVISION" ]; then
 fi
 
 $DAILY_BRANCH_PREMAKE_HOOK
+
 flight=`$makeflight $branch $xenbranch $OSSTEST_BLESSING "$@"`
+
+case $branch in
+xen-unstable-smoke)
+       ./mg-adjust-flight-makexrefs -v $flight \
+               '!build-amd64 !build-amd64-libvirt !build-armhf build-*' \
+               --debug --branch=xen-unstable --blessings=real
+       # Even adhoc or play flights ought to reuse only real
+       # previous builds.
+       ;;
+esac
+
 $DAILY_BRANCH_POSTMAKE_HOOK
 
 heading=tmp/$flight.heading-info