Re: [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

[Ian Campbell <ian.campbell@citrix.com>]

On Mon, 2015-10-19 at 12:44 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [PATCH OSSTEST] Switch to merged qemu-xen{,
> -traditional}.git trees"):
> > We discussed on IRC with you and Stefano and are going to aim to push
> > this
> > in the w/c 19 October.
> 
> We have decided under the circumstances to postpone this to next week.
> 
> It would probably have been possible for me to pick things up from
> the deployment plan in your mail
>    [PATCH OSSTEST+XEN 0/1+1] Switching to one qemu tree per qemu version
> (trad vs upstream)
> But it seems better to wait for you to be back.

That was probably wise, although I'm on vacation next week.

I thought maybe I'd be able to manage it today given the existence of the
checklist, but I think actually I'm too fuzzy headed even for that.

I made some updates to the plan last week, see below.

Ian.


 * Today we can already just remove the old staging/qemu-xen-* trees, they
   are unused (apart from being manually pushed to along with the staging
   trees, I think).
   
 * Move the two new trees out of people/ianc into the correct places.
   Ensure git-http etc all works and that Stefano + IanJ have appropriate
   permissions.

 * See if there is a way to prevent pushes to the old trees (e.g. a
   setting in their .git/config file).

 * Test osstest patch <1443793989.11707.121.camel@citrix.com>. Quoth iwj:

   * explicitly ap-push and ap-fetch the relevant trees. Perhaps do
     the ap-push as a user without the appropriate permissions to get
     a dry run.

   * Update patch as necessary.
   
 * Push resulting tested osstest patch. Probably force push
 
 * Once that change is in osstest.git#production Stefano and Ian would
   switch to pushing to the appropriate staging* branches new trees.

   osstest will ignore the old staging trees and osstest will update both
   the new master/stable branches and the old stable trees (but not the old
   qemu-upstream-unstable#master branch).
   
 * ASAP after the osstest patch reaches production push the patch
   <1442486509.18856.166.camel@citrix.com> to xen.git#staging.

   NOTE: s/qemu-xen-traditional\.h/qemu-xen-traditional.git./ on the commit
   message and add Ian J's ack.
   
   This will cause the xen-unstable builds to use the new output gate.

   Until this is done unstable builds will continue using the old
   master push gate, which is not updated after the osstest update
   (only stable branches are).
   
 * Remove the old staging/qemu-upstream-* trees, they are not
   referenced by anything.
   
 * At our leisure backport the xen.git change to stable branches, probably
   back as far as 4.2 (when qemu-xen was introduced).
   
 * Do stable releases of each of the above.
 
 * Drop (one by one or all at once) the push to the legacy stable branches
   from osstest as stable releases are made referencing the new trees.
   
 * Consider hiding (or removing) the old output trees from xenbits as well.
   => Not possible with current gitweb setup.