[Xen-devel] [PATCH OSSTEST 3/3] cr-daily-branch: Fix URLs used for trees which should be using push gate output

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

For several trees we were using the upstream URL for tests of all branches when
we should have been using the push gate output on xenbits (to help isolate us
from external failures). i.e. tree_libvirt was git://libvirt.org/libvirt.git
for every branch but for branches other than libvirt it should be
git://xenbits.xen.org/libvirt.git.

This is down to a missing third argument to determine_version. Fix this for all
but osstest (which shouldn't be touched).

Tested with:
 $ BRANCHES="xen-unstable libvirt rumpuserxen seabios qemu-mainline 
qemu-xen-unstable linux-next linuxfirmware osstest"
 $ for b in $BRANCHES ; do f=T${b//-}; ./standalone make-flight -f $f $b; done
 $ check() { \
     f=T${1//-} ; \
     echo $1 ; \
     ./mg-show-flight-runvars $f | \
         awk '$2 ~ /^tree_/ && $3 !~ /^$|xenbits.xen.org/ { printf "    %-28s 
%s\n", $2, $3 }' | \
         sort -u; \
   }
 $ for b in xen-unstable libvirt rumpuserxen seabios qemu-mainline 
qemu-xen-unstable linux-next osstest ; do check $b; done

Which produces:

xen-unstable
    tree_gnulib_libvirt          
git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try]
    tree_rumpuserxen_rumpsrc     
https://github.com/rumpkernel/rumpkernel-netbsd-src
libvirt
    tree_gnulib_libvirt          
git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try]
    tree_libvirt                 git://libvirt.org/libvirt.git
    tree_rumpuserxen_rumpsrc     
https://github.com/rumpkernel/rumpkernel-netbsd-src
rumpuserxen
    tree_rumpuserxen             https://github.com/rumpkernel/rumpuser-xen
    tree_rumpuserxen_rumpsrc     
https://github.com/rumpkernel/rumpkernel-netbsd-src
seabios
    tree_gnulib_libvirt          
git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try]
    tree_rumpuserxen_rumpsrc     
https://github.com/rumpkernel/rumpkernel-netbsd-src
    tree_seabios                 git://git.seabios.org/seabios.git
qemu-mainline
    tree_gnulib_libvirt          
git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try]
    tree_qemuu                   git://git.qemu.org/qemu.git
    tree_rumpuserxen_rumpsrc     
https://github.com/rumpkernel/rumpkernel-netbsd-src
qemu-xen-unstable
linux-next
    tree_gnulib_libvirt          
git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try]
    tree_linux                   
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
    tree_rumpuserxen_rumpsrc     
https://github.com/rumpkernel/rumpkernel-netbsd-src
linuxfirmware
    tree_gnulib_libvirt          
git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try]
    tree_rumpuserxen_rumpsrc     
https://github.com/rumpkernel/rumpkernel-netbsd-src
osstest
    tree_gnulib_libvirt          
git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try]
    tree_rumpuserxen_rumpsrc     
https://github.com/rumpkernel/rumpkernel-netbsd-src

The presence of tree_gnulib_libvirt is expected while the
tree_rumpuserxen_rumpsrc is erroneous (I think) but not intended to be fixed
here.

Note that linuxfirmware is broken since tree_linuxfirmware should be
$GIT_KERNEL_ORG/pub/scm/linux/kernel/git/firmware/linux-firmware.git. This is
also not addressed here.

For comparison the xen-unstable check output prior to this fix was:

xen-unstable
    tree_gnulib_libvirt          
git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try]
    tree_libvirt                 git://libvirt.org/libvirt.git
    tree_rumpuserxen             https://github.com/rumpkernel/rumpuser-xen
    tree_rumpuserxen_rumpsrc     
https://github.com/rumpkernel/rumpkernel-netbsd-src

Note the incorrect tree_libvirt and tree_rumpuserxen.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 cr-daily-branch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cr-daily-branch b/cr-daily-branch
index 1514397..90eb499 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -140,26 +140,26 @@ if [ "x$REVISION_SEABIOS" = x ]; then
     if [ "x$tree" = "xseabios" ]; then
        TREE_SEABIOS=$TREE_SEABIOS_UPSTREAM
        export TREE_SEABIOS
-       determine_version REVISION_SEABIOS seabios
+       determine_version REVISION_SEABIOS seabios SEABIOS
        export REVISION_SEABIOS
     else
        : REVISION_SEABIOS from Config.mk
     fi
 fi
 if [ "x$REVISION_LIBVIRT" = x ]; then
-       determine_version REVISION_LIBVIRT libvirt
+       determine_version REVISION_LIBVIRT libvirt LIBVIRT
        export REVISION_LIBVIRT
 fi
 if [ "x$REVISION_GNULIB_LIBVIRT" = x ]; then
-       determine_version REVISION_GNULIB_LIBVIRT gnulib-libvirt
+       determine_version REVISION_GNULIB_LIBVIRT gnulib-libvirt GNULIB_LIBVIRT
        export REVISION_GNULIB_LIBVIRT
 fi
 if [ "x$REVISION_RUMPUSERXEN" = x ]; then
-       determine_version REVISION_RUMPUSERXEN rumpuserxen
+       determine_version REVISION_RUMPUSERXEN rumpuserxen RUMPUSERXEN
        export REVISION_RUMPUSERXEN
 fi
 if [ "x$REVISION_LINUXFIRMWARE" = x ]; then
-       determine_version REVISION_LINUXFIRMWARE linuxfirmware
+       determine_version REVISION_LINUXFIRMWARE linuxfirmware LINUXFIRMWARE
         export REVISION_LINUXFIRMWARE
 fi
 
-- 
1.9.0


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