This branch contains Xen and Linux build jobs and all jobs which contain xtf in their name.
Signed-off-by: Wei Liu <wei.l...@citrix.com> --- I'm not sure if everything is ok because I can't test all changes. --- ap-fetch-version | 4 ++++ ap-print-url | 3 +++ ap-push | 5 +++++ cr-daily-branch | 8 ++++++++ cr-for-branches | 2 +- cri-common | 1 + make-flight | 18 ++++++++++++++++++ 7 files changed, 40 insertions(+), 1 deletion(-) diff --git a/ap-fetch-version b/ap-fetch-version index f26d60a..fa78d51 100755 --- 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 4088852..8c5e604 100755 --- a/ap-print-url +++ b/ap-print-url @@ -58,6 +58,9 @@ rumpuserxen) seabios) echo $TREE_SEABIOS_UPSTREAM ;; +xtf) + echo $TREE_XTF_UPSTREAM + ;; ovmf) echo $TREE_OVMF_UPSTREAM ;; diff --git a/ap-push b/ap-push index e33a803..63b7f80 100755 --- a/ap-push +++ b/ap-push @@ -40,6 +40,7 @@ TREE_LIBVIRT=$PUSH_TREE_LIBVIRT TREE_RUMPUSERXEN=$PUSH_TREE_RUMPUSERXEN 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 21780b8..3f74e2e 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -195,6 +195,10 @@ if [ "x$REVISION_LIBVIRT" = x ]; then determine_version REVISION_LIBVIRT libvirt LIBVIRT export REVISION_LIBVIRT fi +if [ "x$REVISION_XTF" = x ]; then + determine_version REVISION_XTF xtf XTF + export REVISION_XTF +fi if [ "x$REVISION_RUMPUSERXEN" = x ]; then determine_version REVISION_RUMPUSERXEN rumpuserxen RUMPUSERXEN export REVISION_RUMPUSERXEN @@ -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 6a161d4..5e8b1a4 100755 --- 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 cdee48d..6d5545c 100644 --- a/cri-common +++ b/cri-common @@ -78,6 +78,7 @@ select_xenbranch () { libvirt) tree=libvirt; xenbranch=xen-unstable ;; rumpuserxen) tree=rumpuserxen; 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 613b3d0..8aec1a7 100755 --- 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) ;; -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel