diff mbox

[Xen-devel,xen-4.3-testing,test] 26419: regressions - FAIL

Message ID 1400837250.18336.8.camel@kazak.uk.xensource.com
State New
Headers show

Commit Message

Ian Campbell May 23, 2014, 9:27 a.m. UTC 
On Fri, 2014-05-23 at 10:11 +0100, Ian Campbell wrote:
> I'll investigate!

I was just stupid, we are using the wrong URL for everything.

8<-----------------------

From 3e295dffbaffc4b464154049725224aefba6b5f9 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 23 May 2014 10:26:26 +0100
Subject: [PATCH] cr-daily-branch: Only set TREE_SEABIOS for seabios flights

For all other flights we want to use the Config.mk settings.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 ap-common        | 2 +-
 ap-fetch-version | 2 +-
 ap-print-url     | 2 +-
 cr-daily-branch  | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

Comments

Ian Campbell May 23, 2014, 9:53 a.m. UTC | #1 
On Fri, 2014-05-23 at 10:27 +0100, Ian Campbell wrote:
> On Fri, 2014-05-23 at 10:11 +0100, Ian Campbell wrote:
> > I'll investigate!
> 
> I was just stupid, we are using the wrong URL for everything.

Ian acked this verbally and I've pushed it to osstest's pretest branch.
Hopefully it'll sort itself out over the w/e.

Ian.
diff mbox

Patch

diff --git a/ap-common b/ap-common
index b4b3310..bca0fea 100644
--- a/ap-common
+++ b/ap-common
@@ -47,7 +47,7 @@ 
 : ${TREE_RUMPUSERXEN_RUMPSRC:=https://github.com/rumpkernel/rumpkernel-netbsd-src}
 : ${TREEVCS_RUMPUSERXEN_RUMPSRC:=git}
 
-: ${TREE_SEABIOS:=git://git.seabios.org/seabios.git}
+: ${TREE_SEABIOS_UPSTREAM:=git://git.seabios.org/seabios.git}
 : ${PUSH_TREE_SEABIOS:=$XENBITS:/home/xen/git/osstest/seabios.git}
 : ${BASE_TREE_SEABIOS:=git://xenbits.xen.org/osstest/seabios.git}
 
diff --git a/ap-fetch-version b/ap-fetch-version
index 638ab6d..9c189b4 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -87,7 +87,7 @@  rumpuserxen)
 	;;
 seabios)
 	repo_tree_rev_fetch_git seabios \
-		$TREE_SEABIOS master $LOCALREV_SEABIOS
+		$TREE_SEABIOS_UPSTREAM master $LOCALREV_SEABIOS
 	;;
 osstest)
 	if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
diff --git a/ap-print-url b/ap-print-url
index 077cdff..a14d2a6 100755
--- a/ap-print-url
+++ b/ap-print-url
@@ -59,7 +59,7 @@  rumpuserxen)
 	echo $TREE_RUMPUSERXEN
 	;;
 seabios)
-	echo $TREE_SEABIOS
+	echo $TREE_SEABIOS_UPSTREAM
 	;;
 osstest)
 	echo none:;
diff --git a/cr-daily-branch b/cr-daily-branch
index f280ba7..1514397 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -138,6 +138,8 @@  if [ "x$REVISION_LINUX_ARM" = x ]; then
 fi
 if [ "x$REVISION_SEABIOS" = x ]; then
     if [ "x$tree" = "xseabios" ]; then
+	TREE_SEABIOS=$TREE_SEABIOS_UPSTREAM
+	export TREE_SEABIOS
 	determine_version REVISION_SEABIOS seabios
 	export REVISION_SEABIOS
     else