| Message ID | 1399898375-5057-1-git-send-email-ian.campbell@citrix.com |
|---|---|
| State | New |
| Headers | show |
Ian Campbell writes ("[PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch."):
> The naming here is slightly confused because we call our branches of qemuu on
> xenbits "qemu-upstream-foo", so I went with qemu-mainline to be distinct.
IMO the tree in osstest/ should be called "qemu.git". It's not got a
different git history to the qemu-upstream-foo. The "mainline"
should be in the ref name.
> +qemu-mainline)
> + repo_tree_rev_fetch_git $branch \
> + $BASE_TREE_QEMU_MAINLINE xen-tested-master $LOCALREV_QEMU_MAINLINE
Maybe some / in the branch name ?
> diff --git a/cri-common b/cri-common
> index d82312c..d901383 100644
> --- a/cri-common
> +++ b/cri-common
> @@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () {
> select_xenbranch () {
> case "$branch" in
> xen*) tree=xen; xenbranch=$branch ;;
> + qemu-mainline) tree=qemuu; xenbranch=xen-unstable qemuubranch=qemu-mainline;;
> qemu-upstream-*) tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};;
> linux) tree=linux; xenbranch=xen-unstable ;;
> linux-*) tree=linux; xenbranch=xen-unstable ;;
> @@ -55,6 +56,9 @@ select_xenbranch () {
> else
> linuxbranch=''
> fi
> + if [ x$qemuubranch = x ]; then
> + qemuubranch="qemu-upstream-${xenbranch#xen-}"
> + fi
Perhaps it would be easier to move the default setting of qemuubranch
above the case, where it wouldn't need to be conditional.
Ian.
On Mon, 2014-05-12 at 16:15 +0100, Ian Jackson wrote: > Ian Campbell writes ("[PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch."): > > The naming here is slightly confused because we call our branches of qemuu on > > xenbits "qemu-upstream-foo", so I went with qemu-mainline to be distinct. > > IMO the tree in osstest/ should be called "qemu.git". It's not got a > different git history to the qemu-upstream-foo. OK > The "mainline" should be in the ref name. Currently the ref name is xen-tested-master, because the input branch from upstream is called master. xen-tested-mainline-master perhaps? > > > +qemu-mainline) > > + repo_tree_rev_fetch_git $branch \ > > + $BASE_TREE_QEMU_MAINLINE xen-tested-master $LOCALREV_QEMU_MAINLINE > > Maybe some / in the branch name ? FWIW libvirt uses the same ref name, but I'm happy to change if you would prefer, although I'm not sure what the benefit would be. Anyway, what would you suggest? > > diff --git a/cri-common b/cri-common > > index d82312c..d901383 100644 > > --- a/cri-common > > +++ b/cri-common > > @@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () { > > select_xenbranch () { > > case "$branch" in > > xen*) tree=xen; xenbranch=$branch ;; > > + qemu-mainline) tree=qemuu; xenbranch=xen-unstable qemuubranch=qemu-mainline;; > > qemu-upstream-*) tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};; > > linux) tree=linux; xenbranch=xen-unstable ;; > > linux-*) tree=linux; xenbranch=xen-unstable ;; > > @@ -55,6 +56,9 @@ select_xenbranch () { > > else > > linuxbranch='' > > fi > > + if [ x$qemuubranch = x ]; then > > + qemuubranch="qemu-upstream-${xenbranch#xen-}" > > + fi > > Perhaps it would be easier to move the default setting of qemuubranch > above the case, where it wouldn't need to be conditional. Yes, good suggestion. Ian.
Ian Campbell writes ("Re: [PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch."):
> On Mon, 2014-05-12 at 16:15 +0100, Ian Jackson wrote:
> > The "mainline" should be in the ref name.
>
> Currently the ref name is xen-tested-master, because the input branch
> from upstream is called master. xen-tested-mainline-master perhaps?
Given what you say below, how about mainline/xen-tested-master ?
> > > +qemu-mainline)
> > > + repo_tree_rev_fetch_git $branch \
> > > + $BASE_TREE_QEMU_MAINLINE xen-tested-master $LOCALREV_QEMU_MAINLINE
> >
> > Maybe some / in the branch name ?
>
> FWIW libvirt uses the same ref name, but I'm happy to change if you
> would prefer, although I'm not sure what the benefit would be. Anyway,
> what would you suggest?
Oh, consistency above pickiness. So xen-tested-master is right.
Ian.
On Mon, 2014-05-12 at 16:21 +0100, Ian Campbell wrote: > > > diff --git a/cri-common b/cri-common > > > index d82312c..d901383 100644 > > > --- a/cri-common > > > +++ b/cri-common > > > @@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () { > > > select_xenbranch () { > > > case "$branch" in > > > xen*) tree=xen; xenbranch=$branch ;; > > > + qemu-mainline) tree=qemuu; xenbranch=xen-unstable qemuubranch=qemu-mainline;; > > > qemu-upstream-*) tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};; > > > linux) tree=linux; xenbranch=xen-unstable ;; > > > linux-*) tree=linux; xenbranch=xen-unstable ;; > > > @@ -55,6 +56,9 @@ select_xenbranch () { > > > else > > > linuxbranch='' > > > fi > > > + if [ x$qemuubranch = x ]; then > > > + qemuubranch="qemu-upstream-${xenbranch#xen-}" > > > + fi > > > > Perhaps it would be easier to move the default setting of qemuubranch > > above the case, where it wouldn't need to be conditional. > > Yes, good suggestion. Actually no: It uses $xenbranch which is set by the case. Ian.
diff --git a/ap-common b/ap-common index ed37811..0969ab3 100644 --- a/ap-common +++ b/ap-common @@ -70,6 +70,11 @@ fi : ${TREE_QEMU_UPSTREAM:=git://xenbits.xen.org/staging/qemu-upstream-${xenbranch#xen-}.git} : ${LOCALREV_QEMU_UPSTREAM:=daily-cron.$branch} +: ${TREE_QEMU_MAINLINE:=git://git.qemu.org/qemu.git} +: ${BASE_TREE_QEMU_MAINLINE:=git://xenbits.xen.org/osstest/qemu-mainline.git} +: ${PUSH_TREE_QEMU_MAINLINE:=$XENBITS:/home/xen/git/osstest/qemu-mainline.git} +: ${LOCALREV_QEMU_MAINLINE:=daily-cron.$branch} + info_linux_tree () { case $1 in diff --git a/ap-fetch-version b/ap-fetch-version index 7cc2d98..a4558ea 100755 --- a/ap-fetch-version +++ b/ap-fetch-version @@ -49,6 +49,10 @@ xen-4.*-testing) repo_tree_rev_fetch_git xen \ $TREE_XEN staging-$branchcore $LOCALREV_XEN ;; +qemu-mainline) + repo_tree_rev_fetch_git $branch \ + $TREE_QEMU_MAINLINE master $LOCALREV_QEMU_UPSTREAM + ;; qemu-upstream-*) repo_tree_rev_fetch_git $branch \ $TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM diff --git a/ap-fetch-version-old b/ap-fetch-version-old index 3879e09..f71626f 100755 --- a/ap-fetch-version-old +++ b/ap-fetch-version-old @@ -54,6 +54,10 @@ xen-4.*-testing) repo_tree_rev_fetch_git xen \ $TREE_XEN stable-$branchcore $LOCALREV_XEN ;; +qemu-mainline) + repo_tree_rev_fetch_git $branch \ + $BASE_TREE_QEMU_MAINLINE xen-tested-master $LOCALREV_QEMU_MAINLINE + ;; qemu-upstream-*) repo_tree_rev_fetch_git $branch \ $BASE_TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM diff --git a/ap-print-url b/ap-print-url index b1af0b9..a21efce 100755 --- a/ap-print-url +++ b/ap-print-url @@ -34,6 +34,9 @@ case "$branch" in xen*) echo $TREE_XEN ;; +qemu-mainline) + echo $TREE_QEMU_MAINLINE + ;; qemu-upstream-*) echo $TREE_QEMU_UPSTREAM ;; diff --git a/ap-push b/ap-push index 674559f..00e0d8b 100755 --- a/ap-push +++ b/ap-push @@ -30,6 +30,7 @@ select_xenbranch . ap-common TREE_LINUX=$PUSH_TREE_LINUX +TREE_QEMU_MAINLINE=$PUSH_TREE_QEMU_MAINLINE TREE_QEMU_UPSTREAM=$XENBITS:/home/xen/git/qemu-upstream-${xenbranch#xen-}.git TREE_XEN=$PUSH_TREE_XEN TREE_LIBVIRT=$PUSH_TREE_LIBVIRT @@ -57,6 +58,10 @@ xen-*-testing) xenversion=${xenversion#xen-} git push $TREE_XEN $revision:stable-$xenversion ;; +qemu-mainline) + cd $repos/qemu-mainline + git push $TREE_QEMU_MAINLINE $revision:xen-tested-master + ;; qemu-upstream-*) cd $repos/$branch git push $TREE_QEMU_UPSTREAM $revision:master diff --git a/cr-daily-branch b/cr-daily-branch index 0cafe39..837cf7a 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -111,8 +111,7 @@ if [ "x$REVISION_QEMU_UPSTREAM" = x ]; then xen-3.*|xen-4.[01]-*) ;; *) - REVISION_QEMU_UPSTREAM="`fetch_version \ - qemu-upstream-${xenbranch#xen-}`" + REVISION_QEMU_UPSTREAM="`fetch_version $qemuubranch`" ;; esac export REVISION_QEMU_UPSTREAM @@ -166,7 +165,7 @@ osstest) fi ;; qemuu) - realtree=qemu-upstream-${xenbranch#xen-} + realtree=$qemuubranch NEW_REVISION=$REVISION_QEMU_UPSTREAM ;; linuxfirmware) diff --git a/cr-for-branches b/cr-for-branches index 60611d1..bded06f 100755 --- a/cr-for-branches +++ b/cr-for-branches @@ -31,7 +31,7 @@ scriptoptions="$1"; shift LOGFILE=tmp/cr-for-branches.log export LOGFILE -: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-unstable qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing linux-3.10 linux-3.4 linux-arm-xen ${EXTRA_BRANCHES}} +: ${BRANCHES:=osstest 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-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing linux-3.10 linux-3.4 linux-arm-xen ${EXTRA_BRANCHES}} export BRANCHES fetchwlem=$wlem diff --git a/cri-common b/cri-common index d82312c..d901383 100644 --- a/cri-common +++ b/cri-common @@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () { select_xenbranch () { case "$branch" in xen*) tree=xen; xenbranch=$branch ;; + qemu-mainline) tree=qemuu; xenbranch=xen-unstable qemuubranch=qemu-mainline;; qemu-upstream-*) tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};; linux) tree=linux; xenbranch=xen-unstable ;; linux-*) tree=linux; xenbranch=xen-unstable ;; @@ -55,6 +56,9 @@ select_xenbranch () { else linuxbranch='' fi + if [ x$qemuubranch = x ]; then + qemuubranch="qemu-upstream-${xenbranch#xen-}" + fi } select_branch () {
The naming here is slightly confused because we call our branches of qemuu on xenbits "qemu-upstream-foo", so I went with qemu-mainline to be distinct. I've introduced $qemuubranch along the lines of $xenbranch, it is normally set to qemu-upstream-{X.Y,unstable} but for the qemu-mainline flight it instead points to qemu-mainline. I've run up to the make-flight bit of cr-daily-branch and it differs only in the expected ways from a standard xen-unstable branch (i.e. uses xen.git#master and qemu.git#master). I did consider causing make-flight:job_create_test_filter_callback to omit any test which didn't use qemuu but I decided not to because it is used for PV qdisk backends too. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- v2: - Finalised repo names on xenbits as /osstest/qemu-mainline.git (and removed associated changelog comment about not being sure) - Removed wanderings about qemu-upstream filtering from commit log too. --- ap-common | 5 +++++ ap-fetch-version | 4 ++++ ap-fetch-version-old | 4 ++++ ap-print-url | 3 +++ ap-push | 5 +++++ cr-daily-branch | 5 ++--- cr-for-branches | 2 +- cri-common | 4 ++++ 8 files changed, 28 insertions(+), 4 deletions(-)