[Xen-devel] [PATCH v7 2/2] OSSTest: push successful raisin builds

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

Determine the most recent raisin revision that needs to be tested, by comparing
with the already tested xen-tested-master branch.  Push to
raisin.git:xen-tested-master when the build is successful.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 ap-common            |    3 +++
 ap-fetch-version     |    3 +++
 ap-fetch-version-old |    5 +++++
 ap-print-url         |    3 +++
 ap-push              |    5 +++++
 cr-daily-branch      |    8 ++++++++
 cri-common           |    1 +
 7 files changed, 28 insertions(+)

diff --git a/ap-common b/ap-common
index 6e1c472..34613bf 100644
--- a/ap-common
+++ b/ap-common
@@ -48,6 +48,8 @@
 # (ie ones which need $bodges=1 in ts-rumpuserxen-build)
 
 : ${TREE_RAISIN:=git://xenbits.xen.org/raisin.git}
+: ${PUSH_TREE_RAISIN:=$XENBITS:/home/xen/git/raisin.git}
+: ${BASE_TREE_RAISIN:=$TREE_RAISIN}
 
 : ${TREE_SEABIOS_UPSTREAM:=git://git.seabios.org/seabios.git}
 : ${PUSH_TREE_SEABIOS:=$XENBITS:/home/xen/git/osstest/seabios.git}
@@ -84,6 +86,7 @@ fi
 : ${LOCALREV_RUMPUSERXEN:=daily-cron.$branch}
 : ${LOCALREV_SEABIOS:=daily-cron.$branch}
 : ${LOCALREV_OVMF:=daily-cron.$branch}
+: ${LOCALREV_RAISIN:=daily-cron.$branch}
 
 : ${TREEBASE_LINUX_XCP:=http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27}
 
diff --git a/ap-fetch-version b/ap-fetch-version
index 33aaf00..fffbbcf 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -80,6 +80,9 @@ libvirt)
 rumpuserxen)
        repo_tree_rev_fetch_git rumpuserxen \
                $TREE_RUMPUSERXEN master $LOCALREV_RUMPUSERXEN
+raisin)
+       repo_tree_rev_fetch_git raisin \
+               $TREE_RAISIN master $LOCALREV_RAISIN
        ;;
 seabios)
        repo_tree_rev_fetch_git seabios \
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 0b4739b..9a2544d 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -29,6 +29,7 @@ select_xenbranch
 : ${BASE_LOCALREV_LINUX:=daily-cron.$branch.old}
 : ${BASE_LOCALREV_LIBVIRT:=daily-cron.$branch.old}
 : ${BASE_LOCALREV_RUMPUSERXEN:=daily-cron.$branch.old}
+: ${BASE_LOCALREV_RAISIN:=daily-cron.$branch.old}
 : ${BASE_LOCALREV_SEABIOS:=daily-cron.$branch.old}
 : ${BASE_LOCALREV_OVMF:=daily-cron.$branch.old}
 
@@ -89,6 +90,10 @@ rumpuserxen)
        repo_tree_rev_fetch_git rumpuserxen \
                $BASE_TREE_RUMPUSERXEN xen-tested-master 
$BASE_LOCALREV_RUMPUSERXEN
        ;;
+raisin)
+       repo_tree_rev_fetch_git raisin \
+               $BASE_TREE_RAISIN xen-tested-master $BASE_LOCALREV_RAISIN
+       ;;
 seabios)
        repo_tree_rev_fetch_git seabios \
                $BASE_TREE_SEABIOS xen-tested-master $BASE_LOCALREV_SEABIOS
diff --git a/ap-print-url b/ap-print-url
index 3db2375..e999b65 100755
--- a/ap-print-url
+++ b/ap-print-url
@@ -55,6 +55,9 @@ libvirt)
 rumpuserxen)
        echo $TREE_RUMPUSERXEN
        ;;
+raisin)
+       echo $TREE_RAISIN
+       ;;
 seabios)
        echo $TREE_SEABIOS_UPSTREAM
        ;;
diff --git a/ap-push b/ap-push
index c141464..c869a8b 100755
--- a/ap-push
+++ b/ap-push
@@ -37,6 +37,7 @@ TREE_LIBVIRT=$PUSH_TREE_LIBVIRT
 TREE_RUMPUSERXEN=$PUSH_TREE_RUMPUSERXEN
 TREE_SEABIOS=$PUSH_TREE_SEABIOS
 TREE_OVMF=$PUSH_TREE_OVMF
+TREE_RAISIN=$PUSH_TREE_RAISIN
 
 if info_linux_tree "$branch"; then
        cd $repos/linux
@@ -89,6 +90,10 @@ rumpuserxen)
        cd $repos/rumpuserxen
        git push $TREE_RUMPUSERXEN $revision:xen-tested-master
        ;;
+raisin)
+       cd $repos/raisin
+       git push $TREE_RAISIN $revision:xen-tested-master
+       ;;
 seabios)
        cd $repos/seabios
        git push $TREE_SEABIOS $revision:refs/heads/xen-tested-master
diff --git a/cr-daily-branch b/cr-daily-branch
index c7d1071..0b7bb78 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -164,6 +164,10 @@ if [ "x$REVISION_RUMPUSERXEN" = x ]; then
        determine_version REVISION_RUMPUSERXEN rumpuserxen RUMPUSERXEN
        export REVISION_RUMPUSERXEN
 fi
+if [ "x$REVISION_RAISIN" = x ]; then
+       determine_version REVISION_RAISIN raisin RAISIN
+       export REVISION_RAISIN
+fi
 if [ "x$REVISION_LINUXFIRMWARE" = x ]; then
        determine_version REVISION_LINUXFIRMWARE linuxfirmware LINUXFIRMWARE
         export REVISION_LINUXFIRMWARE
@@ -209,6 +213,10 @@ rumpuserxen)
        export REVISION_LINUX_OLD=disable
        export REVISION_LIBVIRT=disable
        ;;
+raisin)
+       realtree=raisin
+       NEW_REVISION=$REVISION_RAISIN
+       ;;
 seabios)
        realtree=seabios
        NEW_REVISION=$REVISION_SEABIOS
diff --git a/cri-common b/cri-common
index ad44546..c091622 100644
--- a/cri-common
+++ b/cri-common
@@ -70,6 +70,7 @@ select_xenbranch () {
        linuxfirmware)      tree=linuxfirmware; xenbranch=xen-unstable ;;
        libvirt)                tree=libvirt;   xenbranch=xen-unstable ;;
        rumpuserxen)          tree=rumpuserxen; xenbranch=xen-unstable ;;
+       raisin)                 tree=raisin;    xenbranch=xen-unstable ;;
        seabios)                tree=seabios;   xenbranch=xen-unstable ;;
        ovmf)                   tree=ovmf;      xenbranch=xen-unstable ;;
        osstest)                tree=osstest;   xenbranch=xen-unstable ;;
-- 
1.7.10.4


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