Create XTF branch

This branch contains Xen and Linux build jobs and all jobs which contain
xtf in their name.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ap-fetch-version b/ap-fetch-version
index 8562159e0e622357ca6e51830914f8cbc0be0b40..4a4a89226b631fa545407386191608ee00dd5428 100755 (executable)
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -98,6 +98,10 @@ seabios)
        repo_tree_rev_fetch_git seabios \
                $TREE_SEABIOS_UPSTREAM master $LOCALREV_SEABIOS
        ;;
+xtf)
+       repo_tree_rev_fetch_git xtf \
+               $TREE_XTF_UPSTREAM master $LOCALREV_XTF
+       ;;
 ovmf)
        repo_tree_rev_fetch_git ovmf \
                $TREE_OVMF_UPSTREAM master $LOCALREV_OVMF

diff --git a/ap-print-url b/ap-print-url
index 8a41e70002546bfc0cf5e9f6aad914236748c131..38eaf4e7da2a65c05f6ec47df69bc161f3b4c746 100755 (executable)
--- a/ap-print-url
+++ b/ap-print-url
@@ -58,6 +58,9 @@ rumprun)
 seabios)
        echo $TREE_SEABIOS_UPSTREAM
        ;;
+xtf)
+       echo $TREE_XTF_UPSTREAM
+       ;;
 ovmf)
        echo $TREE_OVMF_UPSTREAM
        ;;

diff --git a/ap-push b/ap-push
index 7d3d4736f20caad4a03bb833a8ee61f7a9b1acdd..a27ccc224e7349337fc09675db895bf7bf74dadf 100755 (executable)
--- a/ap-push
+++ b/ap-push
@@ -40,6 +40,7 @@ TREE_LIBVIRT=$PUSH_TREE_LIBVIRT
 TREE_RUMPRUN=$PUSH_TREE_RUMPRUN
 TREE_SEABIOS=$PUSH_TREE_SEABIOS
 TREE_OVMF=$PUSH_TREE_OVMF
+TREE_XTF=$PUSH_TREE_XTF
 
 if info_linux_tree "$branch"; then
        cd $repos/linux
@@ -120,6 +121,10 @@ seabios)
        cd $repos/seabios
        git push $TREE_SEABIOS $revision:refs/heads/xen-tested-master
        ;;
+xtf)
+       cd $repos/xtf
+       git push $TREE_XTF $revision:refs/heads/xen-tested-master
+       ;;
 ovmf)
        cd $repos/ovmf
        git push $TREE_OVMF $revision:refs/heads/xen-tested-master

diff --git a/cr-daily-branch b/cr-daily-branch
index 7d49439413beb969f304841d83a1fd471554394c..158554d79e11a2adc428f0f0c6d8b1ff7b0626ed 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -199,6 +199,10 @@ if [ "x$REVISION_RUMPRUN" = x ]; then
        determine_version REVISION_RUMPRUN rumprun RUMPRUN
        export REVISION_RUMPRUN
 fi
+if [ "x$REVISION_XTF" = x ]; then
+       determine_version REVISION_XTF xtf XTF
+       export REVISION_XTF
+fi
 if [ "x$REVISION_LINUXFIRMWARE" = x ]; then
        determine_version REVISION_LINUXFIRMWARE linuxfirmware LINUXFIRMWARE
         export REVISION_LINUXFIRMWARE
@@ -248,6 +252,10 @@ seabios)
        realtree=seabios
        NEW_REVISION=$REVISION_SEABIOS
        ;;
+xtf)
+       realtree=xtf
+       NEW_REVISION=$REVISION_XTF
+       ;;
 ovmf)
        realtree=ovmf
        NEW_REVISION=$REVISION_OVMF

diff --git a/cr-for-branches b/cr-for-branches
index 6a161d4e5a511a46c095051e53732528afdd6d82..5e8b1a4749562042c403c4419029097a64f445fd 100755 (executable)
--- a/cr-for-branches
+++ b/cr-for-branches
@@ -31,7 +31,7 @@ scriptoptions="$1"; shift
 LOGFILE=tmp/cr-for-branches.log
 export LOGFILE
 
-: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-4.5-testing xen-4.6-testing xen-4.7-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing qemu-upstream-4.5-testing qemu-upstream-4.6-testing qemu-upstream-4.7-testing linux-4.1 linux-3.18 linux-3.16 linux-3.14 linux-3.10 linux-3.4 linux-arm-xen seabios ovmf ${EXTRA_BRANCHES}}
+: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-4.5-testing xen-4.6-testing xen-4.7-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing qemu-upstream-4.5-testing qemu-upstream-4.6-testing qemu-upstream-4.7-testing linux-4.1 linux-3.18 linux-3.16 linux-3.14 linux-3.10 linux-3.4 linux-arm-xen seabios ovmf xtf ${EXTRA_BRANCHES}}
 export BRANCHES
 
 fetchwlem=$wlem

diff --git a/cri-common b/cri-common
index 6e555a626349d22618d2890a8fdc55417bb40feb..ac360de316247fcd1313c8c53c0c199f5485e961 100644 (file)
--- a/cri-common
+++ b/cri-common
@@ -78,6 +78,7 @@ select_xenbranch () {
        libvirt)                tree=libvirt;   xenbranch=xen-unstable ;;
        rumprun)              tree=rumprun; xenbranch=xen-unstable ;;
        seabios)                tree=seabios;   xenbranch=xen-unstable ;;
+       xtf)                    tree=xtf;       xenbranch=xen-unstable ;;
        ovmf)                   tree=ovmf;      xenbranch=xen-unstable ;;
        distros-*)              tree=none;      xenbranch=xen-unstable ;;
        osstest)                tree=osstest;   xenbranch=xen-unstable ;;

diff --git a/make-flight b/make-flight
index 7b166e1a33b1bdefc07386e5c909a411f40182ba..9b479998a0a67aa4e339fdcb96b8023349635305 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -75,6 +75,14 @@ job_create_build_filter_callback () {
         *)                     return 1 ;;
       esac
     ;;
+    xtf)
+      case "$job" in
+        build-amd64)           ;;
+        build-amd64-pvops)     ;;
+        build-*-xtf)           ;;
+        *)                     return 1 ;;
+      esac
+    ;;
   esac
   return 0
 }
@@ -116,6 +124,16 @@ job_create_test_filter_callback () {
           return 1;;
       esac
       ;;
+    xtf)
+      case "$xenarch:$dom0arch" in
+          amd64:amd64) ;;
+          *) return 1;;
+      esac
+      case $job in
+          *-xtf-*) ;;
+          *) return 1;;
+      esac
+      ;;
     seabios)
       case $xenarch in
           amd64|i386) ;;

diff --git a/mfi-common b/mfi-common
index 00921c408cb59bfb54a6779e0dcf2a8250fa47b9..1c73fee4b4f5afd0bcef97200abc7ed0e205b397 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -75,6 +75,7 @@ branch_wants_xtf_tests () {
     xen-4.2-testing) return 1 ;;
     xen-4.3-testing) return 1 ;;
     xen-*) return 0;;
+    xtf*) return 0;;
     *) return 1 ;;
   esac
 }