[PATCH OSSTEST 1/2] Switch default Linux branch from 3.4 to 3.13

[PATCH OSSTEST 1/2] Switch default Linux branch from 3.4 to 3.13

[Ian Campbell]

standalone-generate-dump-flight-runvars before and after shows revision_linux
changing from 9f089cfb4be27efe7c1cd1d6261da02496820441 (v3.4.103) to
946de0e6b6ed49eacb03e3cddfcb1d774d6378ed (v3.14.17) for the
build-{amd64,i386}-pvops jobs these branches:

	osstest
	rumpuserxen
	xen-4.0-testing
	xen-4.1-testing
	xen-4.2-testing
	xen-4.3-testing
	xen-4.4-testing
	xen-unstable
	qemu-mainline
	qemu-upstream-4.3-testing
	qemu-upstream-4.4-testing
	qemu-upstream-unstable
	seabios
	libvirt
	qemu-upstream-4.2-testing

build-armhf-pvops and build-*-oldkern jobs as well as the linux-* branches are
unaffected. Which is as expected.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 ap-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ap-common b/ap-common
index 6c7e654..ba3279d 100644
--- a/ap-common
+++ b/ap-common
@@ -59,7 +59,7 @@
 
 : ${PUSH_TREE_LINUX:=$XENBITS:/home/xen/git/linux-pvops.git}
 : ${BASE_TREE_LINUX:=git://xenbits.xen.org/linux-pvops.git}
-: ${BASE_TAG_LINUX:=tested/linux-3.4}
+: ${BASE_TAG_LINUX:=tested/linux-3.14}
 : ${BASE_TAG_LINUX_ARM:=tested/linux-arm-xen}
 
 if [ "x${TREE_LINUX}" = x ]; then
-- 
1.9.0

[PATCH OSSTEST 2/2] Switch armhf to use common default Linux.

[Ian Campbell]

Previous we had a v3.13 based branch which was used for ARM (because
v3.4 was too old). Now that the default is v3.14 we can use it.

standalone-generate-dump-flight-runvars before and after shows the
build-armhf-pvops jobs' linux_revision runvar changing from
95bfbee422b9b1cfe8c2d2e27edf17ce1cc99e04 (v3.13-63-g95bfbee) to
946de0e6b6ed49eacb03e3cddfcb1d774d6378ed (v3.14.17) for these branches:

	libvirt
	osstest
	qemu-mainline
	qemu-upstream-unstable
	xen-4.3-testing
	xen-4.4-testing
	xen-unstable

This is as expected.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 mfi-common | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mfi-common b/mfi-common
index afb6239..5c4f5d5 100644
--- a/mfi-common
+++ b/mfi-common
@@ -73,10 +73,6 @@ create_build_jobs () {
       xen-4.1-testing) continue;;
       xen-4.2-testing) continue;;
       esac
-      pvops_kernel="
-        tree_linux=$TREE_LINUX_ARM
-        revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
-      "
       pvops_kconfig_overrides="
         kconfig_override_y=CONFIG_EXT4_FS
       "
@@ -85,12 +81,15 @@ create_build_jobs () {
       case "$branch" in
       linux-arm-xen) continue;;
       esac
+      ;;
+    esac
+
+    if [ "x$pvops_kernel" = x ] ; then
       pvops_kernel="
         tree_linux=$TREE_LINUX
         revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
       "
-      ;;
-    esac
+    fi
 
     case "$arch" in
     *)     suite=$defsuite;;
-- 
1.9.0

Re: [PATCH OSSTEST 1/2] Switch default Linux branch from 3.4 to 3.13

[Ian Campbell]

On Thu, 2014-09-04 at 15:26 +0100, Ian Campbell wrote:

Oops, the subject should clearly say 3.14!

> standalone-generate-dump-flight-runvars before and after shows revision_linux
> changing from 9f089cfb4be27efe7c1cd1d6261da02496820441 (v3.4.103) to
> 946de0e6b6ed49eacb03e3cddfcb1d774d6378ed (v3.14.17) for the
> build-{amd64,i386}-pvops jobs these branches:
> 
> 	osstest
> 	rumpuserxen
> 	xen-4.0-testing
> 	xen-4.1-testing
> 	xen-4.2-testing
> 	xen-4.3-testing
> 	xen-4.4-testing
> 	xen-unstable
> 	qemu-mainline
> 	qemu-upstream-4.3-testing
> 	qemu-upstream-4.4-testing
> 	qemu-upstream-unstable
> 	seabios
> 	libvirt
> 	qemu-upstream-4.2-testing
> 
> build-armhf-pvops and build-*-oldkern jobs as well as the linux-* branches are
> unaffected. Which is as expected.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> ---
>  ap-common | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ap-common b/ap-common
> index 6c7e654..ba3279d 100644
> --- a/ap-common
> +++ b/ap-common
> @@ -59,7 +59,7 @@
>  
>  : ${PUSH_TREE_LINUX:=$XENBITS:/home/xen/git/linux-pvops.git}
>  : ${BASE_TREE_LINUX:=git://xenbits.xen.org/linux-pvops.git}
> -: ${BASE_TAG_LINUX:=tested/linux-3.4}
> +: ${BASE_TAG_LINUX:=tested/linux-3.14}
>  : ${BASE_TAG_LINUX_ARM:=tested/linux-arm-xen}
>  
>  if [ "x${TREE_LINUX}" = x ]; then

Re: [PATCH OSSTEST 1/2] Switch default Linux branch from 3.4 to 3.13

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH OSSTEST 1/2] Switch default Linux branch from 3.4 to 3.13"):
> On Thu, 2014-09-04 at 15:26 +0100, Ian Campbell wrote:
> 
> Oops, the subject should clearly say 3.14!
> 
> > standalone-generate-dump-flight-runvars before and after shows revision_linux
> > changing from 9f089cfb4be27efe7c1cd1d6261da02496820441 (v3.4.103) to
> > 946de0e6b6ed49eacb03e3cddfcb1d774d6378ed (v3.14.17) for the
> > build-{amd64,i386}-pvops jobs these branches:

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

I guess you will push this as it's in your tree right now.

Ian.

Re: [PATCH OSSTEST 1/2] Switch default Linux branch from 3.4 to 3.13

[Ian Campbell]

On Mon, 2014-09-22 at 17:57 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [PATCH OSSTEST 1/2] Switch default Linux branch from 3.4 to 3.13"):
> > On Thu, 2014-09-04 at 15:26 +0100, Ian Campbell wrote:
> > 
> > Oops, the subject should clearly say 3.14!
> > 
> > > standalone-generate-dump-flight-runvars before and after shows revision_linux
> > > changing from 9f089cfb4be27efe7c1cd1d6261da02496820441 (v3.4.103) to
> > > 946de0e6b6ed49eacb03e3cddfcb1d774d6378ed (v3.14.17) for the
> > > build-{amd64,i386}-pvops jobs these branches:
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> I guess you will push this as it's in your tree right now.

Can do. Any opinion on the 2/2 to also switch ARM to this branch?

Re: [PATCH OSSTEST 2/2] Switch armhf to use common default Linux.

[Ian Campbell]

On Thu, 2014-09-04 at 15:26 +0100, Ian Campbell wrote:

I should also have CCd Stefano as the ARM Linux maintainer and
maintainer of the special branch which ARM uses today. Done

> Previous we had a v3.13 based branch which was used for ARM (because
> v3.4 was too old). Now that the default is v3.14 we can use it.
> 
> standalone-generate-dump-flight-runvars before and after shows the
> build-armhf-pvops jobs' linux_revision runvar changing from
> 95bfbee422b9b1cfe8c2d2e27edf17ce1cc99e04 (v3.13-63-g95bfbee) to
> 946de0e6b6ed49eacb03e3cddfcb1d774d6378ed (v3.14.17) for these branches:
> 
> 	libvirt
> 	osstest
> 	qemu-mainline
> 	qemu-upstream-unstable
> 	xen-4.3-testing
> 	xen-4.4-testing
> 	xen-unstable
> 
> This is as expected.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> ---
>  mfi-common | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/mfi-common b/mfi-common
> index afb6239..5c4f5d5 100644
> --- a/mfi-common
> +++ b/mfi-common
> @@ -73,10 +73,6 @@ create_build_jobs () {
>        xen-4.1-testing) continue;;
>        xen-4.2-testing) continue;;
>        esac
> -      pvops_kernel="
> -        tree_linux=$TREE_LINUX_ARM
> -        revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
> -      "
>        pvops_kconfig_overrides="
>          kconfig_override_y=CONFIG_EXT4_FS
>        "
> @@ -85,12 +81,15 @@ create_build_jobs () {
>        case "$branch" in
>        linux-arm-xen) continue;;
>        esac
> +      ;;
> +    esac
> +
> +    if [ "x$pvops_kernel" = x ] ; then
>        pvops_kernel="
>          tree_linux=$TREE_LINUX
>          revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
>        "
> -      ;;
> -    esac
> +    fi
>  
>      case "$arch" in
>      *)     suite=$defsuite;;

Re: [PATCH OSSTEST 1/2] Switch default Linux branch from 3.4 to 3.13

[Ian Campbell]

On Mon, 2014-09-22 at 19:53 +0100, Ian Campbell wrote:
> On Mon, 2014-09-22 at 17:57 +0100, Ian Jackson wrote:
> > Ian Campbell writes ("Re: [PATCH OSSTEST 1/2] Switch default Linux branch from 3.4 to 3.13"):
> > > On Thu, 2014-09-04 at 15:26 +0100, Ian Campbell wrote:
> > > 
> > > Oops, the subject should clearly say 3.14!
> > > 
> > > > standalone-generate-dump-flight-runvars before and after shows revision_linux
> > > > changing from 9f089cfb4be27efe7c1cd1d6261da02496820441 (v3.4.103) to
> > > > 946de0e6b6ed49eacb03e3cddfcb1d774d6378ed (v3.14.17) for the
> > > > build-{amd64,i386}-pvops jobs these branches:
> > 
> > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> > 
> > I guess you will push this as it's in your tree right now.
> 
> Can do. Any opinion on the 2/2 to also switch ARM to this branch?

You told me on IRC that you intended for the Ack to apply to both
patches, so I've pushed both.

Thanks,
Ian.