[OSSTEST PATCH 1/2] cri-getprevxenbranch: Only ever return xen-X.Y-testing

[OSSTEST PATCH 1/2] cri-getprevxenbranch: Only ever return xen-X.Y-testing

[Ian Jackson]

Only consider xen-[0-9]* as candidates either for returning, or for
matching the current branch.

The effect is that attempts to ask for the `previous Xen branch' of
anything other than a Xen stable branch give the latest Xen stable
branch, which I think is correct.

This fixes a bug where the `previous branch' of xen-unstable-smoke was
considered to be xen-unstable-coverity (!)

This bug would not have been of any consequence, except that the
coverity tested branch name in xen.bit changed in
c/s d94637b6 "coverity: run tests on smoked rather than master"
and had not been created, so that cr-daily-branch would crash for
most branches because the (largely irrelevant) invocation of
`./ap-fetch-version-old xen-unstable-coverity' would fail.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 cri-getprevxenbranch |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cri-getprevxenbranch b/cri-getprevxenbranch
index a70138e..c4e3ee5 100755
--- a/cri-getprevxenbranch
+++ b/cri-getprevxenbranch
@@ -7,7 +7,7 @@ p=
 
 for b in $(./mg-list-all-branches) ; do # already sorted by version
     case "$b" in
-	xen*)
+	xen-[0-9]*)
 	    if [ "x$b" = "x$xenbranch" ] ; then
 		break
 	    else
-- 
1.7.10.4


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

[OSSTEST PATCH 2/2] coverity: Rename branch names to `smoke', not `smoked'

[Ian Jackson]

c/s d94637b6 "coverity: run tests on smoked rather than master"
used `smoked' in several places, including as the name of the
input branch (which is already established as `smoke'), and the name
of the coverity-tested branch.

But we call this `smoke', not `smoked'.

After this patch `git-grep smoked' produces no output, as it did in
d94637b6~.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ap-fetch-version     |    2 +-
 ap-fetch-version-old |    2 +-
 ap-push              |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ap-fetch-version b/ap-fetch-version
index af2feae..f26d60a 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -54,7 +54,7 @@ xen-4.*-testing)
 		$TREE_XEN staging-$branchcore $LOCALREV_XEN
 	;;
 xen-unstable-coverity)
-	repo_tree_rev_fetch_git xen $TREE_XEN smoked $LOCALREV_XEN
+	repo_tree_rev_fetch_git xen $TREE_XEN smoke $LOCALREV_XEN
 	;;
 qemu-mainline)
 	repo_tree_rev_fetch_git $branch \
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 8efd523..f7a1e26 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -60,7 +60,7 @@ xen-4.*-testing)
 		$TREE_XEN stable-$branchcore $LOCALREV_XEN
 	;;
 xen-unstable-coverity)
-	repo_tree_rev_fetch_git xen $TREE_XEN coverity-tested/smoked $LOCALREV_XEN
+	repo_tree_rev_fetch_git xen $TREE_XEN coverity-tested/smoke $LOCALREV_XEN
 	;;
 qemu-mainline)
         repo_tree_rev_fetch_git $branch \
diff --git a/ap-push b/ap-push
index 2ca419f..e33a803 100755
--- a/ap-push
+++ b/ap-push
@@ -70,7 +70,7 @@ xen-*-testing)
 	;;
 xen-unstable-coverity)
 	cd $repos/xen
-	git push $TREE_XEN $revision:refs/heads/coverity-tested/smoked
+	git push $TREE_XEN $revision:refs/heads/coverity-tested/smoke
 	;;
 qemu-mainline)
 	cd $repos/qemu-mainline
-- 
1.7.10.4


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