[Xen-devel] [OSSTEST PATCH 15/26] cr*: Support xen-unstable-smoke

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

Add this branch to select_xenbranch.  This works like xen-unstable in
most respects.

There are only two places in osstest where xenbranch `xen-unstable' is
treated specially and only one of them needs adjusting to match
xen-unstable-smoke too.

The new branch `xen-unstable-smoke' has a `prev' branch of
`xen-unstable' according to cri-getprevxenbranch, which is technically
wrong, but this is not important because xen-unstable-smoke has no
prev tests.

We are going to sort out the push gate ref plumbing in xen.git in the
next osstest patch.

Also, use a branch-settings file to set the new branch's resource
priority to -20 to make it run ahead of anything else automatic.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
v3: Dropped ack from Ian Campbell
    Set qemuubranch to `qemu-xen-unstable'
    Set xenbranch to `xen-unstable-smoke', not `xen-unstable'
    cr-daily-branch: Update $realtree case for selecting qemuu revision
---
 README.planner                     |    1 +
 branch-settings.xen-unstable-smoke |    1 +
 cr-daily-branch                    |    2 +-
 cri-common                         |    1 +
 4 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 branch-settings.xen-unstable-smoke

diff --git a/README.planner b/README.planner
index dfa623e..3a491a4 100644
--- a/README.planner
+++ b/README.planner
@@ -87,6 +87,7 @@ in the more distant future.
 Values for OSSTEST_RESOURCE_PRIORITY:
   mg-allocate                                    -1000000
   mg-blockage                                    -2000000
+  xen-unstable-smoke cr-daily-branch                  -20
   default Executive.pm with controlling terminal      -10
   mg-execute-flight                                    -8
   default                                               0
diff --git a/branch-settings.xen-unstable-smoke 
b/branch-settings.xen-unstable-smoke
new file mode 100644
index 0000000..b73bc6a
--- /dev/null
+++ b/branch-settings.xen-unstable-smoke
@@ -0,0 +1 @@
+export OSSTEST_RESOURCE_PRIORITY=-20
diff --git a/cr-daily-branch b/cr-daily-branch
index 013aeec..98fafdc 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -340,7 +340,7 @@ case "$NEW_REVISION/$OLD_REVISION" in
                         "$treeurl#$OLD_REVISION-$NEW_REVISION" \
 
                 case "$realtree" in
-                xen-4*|xen-unstable)
+                xen-4*|xen-unstable*)
                     oldqemu=`./ap-qemu-revision $realtree $OLD_REVISION`
                     newqemu=`./ap-qemu-revision $realtree $NEW_REVISION`
                     if [ "$oldqemu" ] && [ "$newqemu" ]; then
diff --git a/cri-common b/cri-common
index 2669485..45545d8 100644
--- a/cri-common
+++ b/cri-common
@@ -66,6 +66,7 @@ select_prevxenbranch () {
 
 select_xenbranch () {
        case "$branch" in
+       xen-unstable-smoke)     tree=xen;       xenbranch=$branch; 
qemuubranch=qemu-xen-unstable;;
        xen-*)                  tree=xen;       xenbranch=$branch ;;
        qemu-mainline)          tree=qemuu;     xenbranch=xen-unstable  
qemuubranch=qemu-mainline;;
         qemu-upstream-*)    tree=qemuu; 
xenbranch=xen-${branch#qemu-upstream-};;
-- 
1.7.10.4


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