[PATCH 0/4] misc/release-checklist: Updates prompted by recent release

[PATCH 0/4] misc/release-checklist: Updates prompted by recent release

[Ian Jackson]

When doing the recent stable release branches, I tripped over some
deficiencies in these checklists.  And, now that they are in git, we
can much more safely throw away a lot of ancient stuff.

Please shout if you have any objections.  I hope to push this today.

Ian.

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

[PATCH 1/4] misc/release-checklist: Remove clearly-obsolete stuff

[Ian Jackson]

Remove:

 - Head comment saying not to edit here.  This came from the
   now-no-longer-master xenbits copy which I have deleted.

 - Many old (commented-out) instruction related to hg

 - Many old (commented-out) instruction related to pre-unified
   qemu trees.

 - Many old (commented-out) instruction related to ancient
   locations within Citrix.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 misc/release-checklist.txt | 64 ----------------------------------------------
 1 file changed, 64 deletions(-)

diff --git a/misc/release-checklist.txt b/misc/release-checklist.txt
index 51f9508..dfeb34a 100644
--- a/misc/release-checklist.txt
+++ b/misc/release-checklist.txt
@@ -1,9 +1,3 @@
-DO NOT EDIT
-
-BEING INCORPORATED INTO GIT
-
-
-
 v=4.1
 ov=4.0
 
@@ -14,17 +8,6 @@ ov=4.0
 * make branch in qemu-iwj.git
         git-branch $v-testing master
 
-#* make branches in /usr/groups/xencore/HG (xen.hg and qemu.git)
-#        cd /usr/groups/xencore/HG
-#        really rsync -aH xen-unstable.hg/. xen-$v-testing.hg &
-#        really rsync -aH qemu-xen-unstable.git/. qemu-xen-$v-testing.git &
-#
-#        ed xen-$v-testing.hg/.hg/hgrc
-#        /unsta
-#        s/unstable/###4.1###-testing
-#        w
-#        q
-
 # make branches in xenbits.xen.org qemus
         ssh xen@xenbits.xen.org
 	cd ~/git/qemu-xen.git
@@ -32,17 +15,6 @@ ov=4.0
 	git branch stable-$v master
 	cd ~/git/qemu-xen-traditional.git
 	git branch stable-$v master
-#        cd ~/git
-#        rsync -aH qemu-xen-unstable.git/. qemu-xen-$v-testing.git &
-#        rsync -aH qemu-upstream-unstable.git/. qemu-upstream-$v-testing.git &
-#        cd staging
-#        rsync -aH qemu-xen-unstable.git/. qemu-xen-$v-testing.git &
-#        rsync -aH qemu-upstream-unstable.git/. qemu-upstream-$v-testing.git &
-#        cd /var/xenbits-www/html/git-http
-#        ln -sf /home/xen/git/qemu-xen-$v-testing.git .
-#        ln -sf /home/xen/git/staging/qemu-xen-$v-testing.git staging/.
-#        ln -sf /home/xen/git/qemu-upstream-$v-testing.git .
-#        ln -sf /home/xen/git/staging/qemu-upstream-$v-testing.git staging/.
 
 # make branch in libvirt
         ssh xen@xenbits.xen.org
@@ -55,15 +27,6 @@ ov=4.0
 	git branch staging-$v staging
 	git branch stable-$v master
 
-## make hg mirror branch(es)
-#	ssh root@xenbits.xen.org
-#	cd ~xen/HG
-#	mkdir {staging/,}xen-$v-testing.hg
-#	chown git2hg:git2hg {staging/,}xen-$v-testing.hg
-# # edit list of repos to mirror - Anthony Perard, or:
-#	ed ~git2hg/update-hg-mirror.sh
-#		/all_xen_version
-
 # update xendocs@xenbits docs generator to generate new stable branch
 #  docs too. commit to git.
 * make 13:37 <ijc> http://xenbits.xen.org/docs/4.2-testing/ is now live true
@@ -103,10 +66,6 @@ ov=4.0
         cp qemu-xen--master.patchbot-reported-heads  qemu-xen--stable-$v.patchbot-reported-heads
         cp qemu-xen--staging.patchbot-reported-heads  qemu-xen--staging-$v.patchbot-reported-heads
         cp qemu-xen-traditional--master.patchbot-reported-heads qemu-xen-traditional--stable-$v.patchbot-reported-heads
-#        cd staging/
-##      cp xen-unstable.last xen-$v-testing.last
-##      cp xen-unstable.last xen-$v-testing.last
-#        cd ..
 
         #emacs versions
 	perl -i~ -pe 'next unless m/\b\Q'$ov'\E\b/; $x=$_; $x=~ s/\b\Q'$ov'\E\b/'$v'/g; print $x;' versions
@@ -128,9 +87,6 @@ which should produce no output.  Replace as necessary.
 
 Update new stable tree's MAINTAINERS to contain correct info for this stable branch
 
-##* update wiki page
-##        http://wiki.xen.org/xenwiki/XenRepositories
-
 ###* fix new trees' vcs descriptions
 #* make old trees' descriptions "historical"
 #	cd ~/git
@@ -145,8 +101,6 @@ Update new stable tree's MAINTAINERS to contain correct info for this stable bra
 
 * make tag in qemu-iwj.git
 
-##* push qemu tag in /usr/groups/xencore/HG		git-update-server-info
-##* push qemu tag in /usr/groups/xencore/patchman		git-update-server-info
 * push qemu tag in xenbits.xen.org		git-update-server-info
 * push qemu tag in xenbits.xen.org staging	git-update-server-info
 
@@ -177,13 +131,7 @@ t=RELEASE-$r
   git-checkout $s
   git-tag -u 'Xen.org Xen tree code signing' -m "Xen $v" xen-$v $s
 
-#  git-push ianj@docr-01:/usr/groups/xencore/HG/qemu-xen-$b.git $s:master xen-$v   # 4.1 and earlier only
-#  git-push latara:/usr/groups/xencore/patchman/qemu-xen-$b.git $s:master xen-$v
   git-push xenbits.xen.org:/home/xen/git/qemu-xen-traditional.git $s:stable-$x xen-$v
-#  git-push xen@xenbits.xen.org:/home/xen/git/qemu-xen-$b.git $s:master xen-$v
-#  git-push xen@xenbits.xen.org:/home/xen/git/staging/qemu-xen-$b.git $s:master xen-$v
-#  ssh xen@xenbits.xen.org cd /home/xen/git/qemu-xen-$b.git '&&' git update-server-info
-#  ssh xen@xenbits.xen.org cd /home/xen/git/staging/qemu-xen-$b.git '&&' git update-server-info
 
 # consider making tag in minios, and updating xen.git Config.mk
   git-tag -u 'xen tree' -s -m "Xen $r$rc" xen-$t
@@ -192,8 +140,6 @@ t=RELEASE-$r
 * Also tag upstream qemu tree (Stefano)
     git tag -u 'xen tree' -s -m "Xen $r$rc" qemu-xen-$r SOMETHING
     git push osstest@xenbits.xen.org:/home/xen/git/qemu-xen.git qemu-xen-$r
-#    git push xen@xenbits.xen.org:/home/xen/git/qemu-upstream-$b.git qemu-xen-$r
-#    git push xen@xenbits.xen.org:/home/xen/git/staging/qemu-upstream-$b.git qemu-xen-$r
 
 * consider bumping sonames of shlibs
 
@@ -261,10 +207,6 @@ mkdir qemu-xen qemu-xen-traditional  # 4.2+
     git-archive --format=tar xen-$v |tar Cxf /volatile/iwj/d/xen-$v/tools/ioemu-qemu-xen -   # 4.0, 4.1
     git-archive --format=tar xen-$v |tar Cxf /volatile/iwj/d/xen-$v/tools/qemu-xen-traditional -   # 4.2+
 
-#    cd /u/iwj/work/1/qemu-upstream-4.2-testing.git # perhaps
-#    cd /u/iwj/work/1/qemu-upstream-4.3-testing.git # perhaps
-#    cd /u/iwj/work/1/qemu-upstream-4.4-testing.git # perhaps
-#    cd /u/iwj/work/1/qemu-upstream-unstable.git # alternatively
     cd /u/iwj/work/1/qemu-upstream.git # now we have a merged tree
     git-pull
     git-archive --format=tar qemu-xen-$v |tar Cxf /volatile/iwj/d/xen-$v/tools/qemu-xen -   # 4.2+
@@ -317,12 +259,6 @@ GZIP=-9v tar zcf /volatile/iwj/website-thing/xen.org/oss-xen/release/$v/xen-$v.t
 	   #   U oss-xen/release/4.8.0-rc2/xen-4.8.0-rc2.tar.gz
 	   #   U oss-xen/release/4.8.0-rc2/xen-4.8.0-rc2.tar.gz.sig
 
-#    cd /volatile/iwj/akamai-xen.org/
-#    cvs -q up
-#    U oss-xen/release/$v/xen-$v.tar.gz
-#    U oss-xen/release/$v/xen-$v.tar.gz.sig
-#    ./upload.sh.~1.3.~
-
 
 update xenbits front page to change references to old stable branch
  into references to new stable branch
-- 
2.1.4


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

[PATCH 2/4] misc/release-checklist: Remove pre-4.3 tarball target instructions

[Ian Jackson]

4.2 is well out of support and we will never need to make a release of
it again.  Delete all the stuff for making combined tarballs "by hand".

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 misc/release-checklist.txt | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/misc/release-checklist.txt b/misc/release-checklist.txt
index dfeb34a..0fa50c9 100644
--- a/misc/release-checklist.txt
+++ b/misc/release-checklist.txt
@@ -190,40 +190,10 @@ RELEASE TARBALL
        mkdir /volatile/iwj/website-thing/xen.org/oss-xen/release/$v
        mv dist/xen-$v.tar.gz /volatile/iwj/website-thing/xen.org/oss-xen/release/$v/.
 
-#hg archive -t files /volatile/iwj/d/xen-$v
-
-cd /u/iwj/work/xen.git
-mkdir /volatile/iwj/d/xen-$v
-git archive --format=tar RELEASE-$v |tar Cxf /volatile/iwj/d/xen-$v -
-[OR FOR RCs
-git archive --format=tar $v |tar Cxf /volatile/iwj/d/xen-$v -
-]
-
-cd /volatile/iwj/d/xen-$v/tools/
-mkdir ioemu-qemu-xen   # 4.0, 4.1
-mkdir qemu-xen qemu-xen-traditional  # 4.2+
-
-    cd /u/iwj/work/1/qemu-iwj.git
-    git-archive --format=tar xen-$v |tar Cxf /volatile/iwj/d/xen-$v/tools/ioemu-qemu-xen -   # 4.0, 4.1
-    git-archive --format=tar xen-$v |tar Cxf /volatile/iwj/d/xen-$v/tools/qemu-xen-traditional -   # 4.2+
-
-    cd /u/iwj/work/1/qemu-upstream.git # now we have a merged tree
-    git-pull
-    git-archive --format=tar qemu-xen-$v |tar Cxf /volatile/iwj/d/xen-$v/tools/qemu-xen -   # 4.2+
-
-cd ..
-# ONE OF:
-ssh xenbits.xen.org cat /home/xen/release-checklist.patch-4.2 | patch Config.mk
-ssh xenbits.xen.org cat /home/xen/release-checklist.patch-4.1 | patch -p1 Config.mk
-ssh xenbits.xen.org cat /home/xen/release-checklist.patch-4.0 | patch -p1 Config.mk
-
         # website-thing is cvs -d hg.uk.xensource.com:/usr/groups/sources/cvs/akamai co xen.org
 	cd /volatile/iwj/website-thing/xen.org
 	mkdir oss-xen/release/$v
 
-cd ..
-GZIP=-9v tar zcf /volatile/iwj/website-thing/xen.org/oss-xen/release/$v/xen-$v.tar.gz xen-$v
-
 # test build
                 cd /volatile/iwj/d
                 mkdir build
@@ -232,14 +202,10 @@ GZIP=-9v tar zcf /volatile/iwj/website-thing/xen.org/oss-xen/release/$v/xen-$v.t
 #                rsync -a --delete xen-$v build/
                 cd xen-$v
                 export http_proxy=http://localhost:3128/
-                (make -j4 KERNELS='' && echo ok.) 2>&1 | tee ../log.$v                      # pre 4.2
                 (./configure && make -j4 KERNELS='' && echo ok.) 2>&1 | tee ../log.$v       # post 4.2
 
 # [[ test build amd64 ]]
 
-### check that tarball's .hgtags has the release tag put there by Keir
-##tar zvvxOf /volatile/iwj/website-thing/xen.org/oss-xen/release/$v/xen-$v.tar.gz xen-$v/.hgtags |less
-
 	cvs add -kb oss-xen/release/$v/
 
         cd oss-xen/release/$v
-- 
2.1.4


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

Re: [PATCH 2/4] misc/release-checklist: Remove pre-4.3 tarball target instructions

[Jan Beulich]

>>> On 09.03.17 at 16:19, <ian.jackson@eu.citrix.com> wrote:
> @@ -232,14 +202,10 @@ GZIP=-9v tar zcf /volatile/iwj/website-thing/xen.org/oss-xen/release/$v/xen-$v.t
>  #                rsync -a --delete xen-$v build/
>                  cd xen-$v
>                  export http_proxy=http://localhost:3128/ 
> -                (make -j4 KERNELS='' && echo ok.) 2>&1 | tee ../log.$v                      # pre 4.2
>                  (./configure && make -j4 KERNELS='' && echo ok.) 2>&1 | tee ../log.$v       # post 4.2

Wouldn't this then better get the comment at the end of the line
dropped too?

Jan


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

Re: [PATCH 2/4] misc/release-checklist: Remove pre-4.3 tarball target instructions

[Ian Jackson]

Jan Beulich writes ("Re: [PATCH 2/4] misc/release-checklist: Remove pre-4.3 tarball target instructions"):
> On 09.03.17 at 16:19, <ian.jackson@eu.citrix.com> wrote:
> > @@ -232,14 +202,10 @@ GZIP=-9v tar zcf /volatile/iwj/website-thing/xen.org/oss-xen/release/$v/xen-$v.t
> > -                (make -j4 KERNELS='' && echo ok.) 2>&1 | tee ../log.$v                      # pre 4.2
> >                  (./configure && make -j4 KERNELS='' && echo ok.) 2>&1 | tee ../log.$v       # post 4.2
> 
> Wouldn't this then better get the comment at the end of the line
> dropped too?

Maybe.  It doesn't hurt cut-and-paste, and means that if anyone tries
this with 4.1.x for some absurd reason, they don't trip over it.
If you want to remove it I don't object.

I'd rather not let the perfect be the enemy of the tolerable, here.

Ian.

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

Re: [PATCH 2/4] misc/release-checklist: Remove pre-4.3 tarball target instructions

[Jan Beulich]

>>> On 09.03.17 at 16:53, <ian.jackson@eu.citrix.com> wrote:
> Jan Beulich writes ("Re: [PATCH 2/4] misc/release-checklist: Remove pre-4.3 
> tarball target instructions"):
>> On 09.03.17 at 16:19, <ian.jackson@eu.citrix.com> wrote:
>> > @@ -232,14 +202,10 @@ GZIP=-9v tar zcf /volatile/iwj/website-thing/xen.org/oss-xen/release/$v/xen-$v.t
>> > -                (make -j4 KERNELS='' && echo ok.) 2>&1 | tee ../log.$v                      # pre 4.2
>> >                  (./configure && make -j4 KERNELS='' && echo ok.) 2>&1 | tee ../log.$v       # post 4.2
>> 
>> Wouldn't this then better get the comment at the end of the line
>> dropped too?
> 
> Maybe.  It doesn't hurt cut-and-paste, and means that if anyone tries
> this with 4.1.x for some absurd reason, they don't trip over it.

Okay, keep it then.

Jan


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

[PATCH 3/4] misc/release-checklist: Split out branching-checklist.txt

[Ian Jackson]

This is almost all just motion.  There is one new paragraph in
branching-checklist.txt:

+ Update both new branches according to release-checklist.txt section re
+ README etc.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 misc/branching-checklist.txt | 97 ++++++++++++++++++++++++++++++++++++++++++++
 misc/release-checklist.txt   | 95 -------------------------------------------
 2 files changed, 97 insertions(+), 95 deletions(-)
 create mode 100644 misc/branching-checklist.txt

diff --git a/misc/branching-checklist.txt b/misc/branching-checklist.txt
new file mode 100644
index 0000000..c905383
--- /dev/null
+++ b/misc/branching-checklist.txt
@@ -0,0 +1,97 @@
+v=4.1
+ov=4.0
+
+##* tag branchpoint
+##        hg tag $v.0-branched
+##        hg sign -k 'Xen tree' 4.1.0-branched
+
+* make branch in qemu-iwj.git
+        git-branch $v-testing master
+
+# make branches in xenbits.xen.org qemus
+        ssh xen@xenbits.xen.org
+	cd ~/git/qemu-xen.git
+	git branch staging-$v staging
+	git branch stable-$v master
+	cd ~/git/qemu-xen-traditional.git
+	git branch stable-$v master
+
+# make branch in libvirt
+        ssh xen@xenbits.xen.org
+        cd ~/git/libvirt.git/
+	git branch osstest/frozen/xen-$v-testing   xen-tested-master
+
+# make branches in xenbits.xen.org xen.git
+        ssh xen@xenbits.xen.org
+        cd ~/git/xen.git
+	git branch staging-$v staging
+	git branch stable-$v master
+
+# update xendocs@xenbits docs generator to generate new stable branch
+#  docs too. commit to git.
+* make 13:37 <ijc> http://xenbits.xen.org/docs/4.2-testing/ is now live true
+#14:17 <ijc> HOWTO: login to xenbits. become "xendocs" . cd cronjobs . edit
+#            xenbits-docs-all.sh in the obvious way. git commit
+	ssh root@xenbits.xen.org
+	su - xendocs
+	cd cronjobs
+	ed xenbits-docs-all.sh
+	/for branch
+	s/$/ 4.6-testing
+	# ^ OR SIMILAR
+	w
+	q
+        git add -p
+	git commit -m "Branch for $v"
+
+### * make symlink on mariner for qemu
+###        cd /var/www/git/
+###        ln -s /usr/groups/xencore/HG/qemu-xen-$v-testing.git .
+
+* make branches etc. in osstest
+        ssh osstest@osstest.test-lab
+	cd testing.git
+	OSSTEST_CONFIG=production-config ./mg-branch-setup xen-$v-testing bisect
+	OSSTEST_CONFIG=production-config ./mg-branch-setup qemu-upstream-$v-testing bisect
+
+* add branch to osstest
+        ie add both eg qemu-upstream-4.2-testing and xen-4.2-testing to BRANCHES in cr-for-branches
+
+* add to patchbot
+        on xenbits
+        cd ~/HG/patchbot/
+
+	cp xen--master.patchbot-reported-heads xen--stable-$v.patchbot-reported-heads
+	cp xen--staging.patchbot-reported-heads xen--staging-$v.patchbot-reported-heads
+        cp qemu-xen--master.patchbot-reported-heads  qemu-xen--stable-$v.patchbot-reported-heads
+        cp qemu-xen--staging.patchbot-reported-heads  qemu-xen--staging-$v.patchbot-reported-heads
+        cp qemu-xen-traditional--master.patchbot-reported-heads qemu-xen-traditional--stable-$v.patchbot-reported-heads
+
+        #emacs versions
+	perl -i~ -pe 'next unless m/\b\Q'$ov'\E\b/; $x=$_; $x=~ s/\b\Q'$ov'\E\b/'$v'/g; print $x;' versions
+        git diff
+	git add versions
+	git commit -m "Branch for $v"
+
+#* update xenbits web page
+        ssh root@xenbits.xen.org
+        cd /var/xenbits-www/html
+        emacs index.html
+	# - search for previous version number, and update in each place found
+	# - in general, drop one old release in favour of the new one
+
+Ensure references to qemu trees in xen.git's Config.mk are updated.
+Check this with
+        grep unstable Config.mk 
+which should produce no output.  Replace as necessary.
+
+Update both new branches according to release-checklist.txt section re
+README etc.
+
+Update new stable tree's MAINTAINERS to contain correct info for this stable branch
+
+###* fix new trees' vcs descriptions
+#* make old trees' descriptions "historical"
+#	cd ~/git
+#	perl -i~ -pe "s/unstable/4.6-testing/" qemu-upstream-$v-testing.git/description
+
diff --git a/misc/release-checklist.txt b/misc/release-checklist.txt
index 0fa50c9..4784256 100644
--- a/misc/release-checklist.txt
+++ b/misc/release-checklist.txt
@@ -1,98 +1,3 @@
-v=4.1
-ov=4.0
-
-##* tag branchpoint
-##        hg tag $v.0-branched
-##        hg sign -k 'Xen tree' 4.1.0-branched
-
-* make branch in qemu-iwj.git
-        git-branch $v-testing master
-
-# make branches in xenbits.xen.org qemus
-        ssh xen@xenbits.xen.org
-	cd ~/git/qemu-xen.git
-	git branch staging-$v staging
-	git branch stable-$v master
-	cd ~/git/qemu-xen-traditional.git
-	git branch stable-$v master
-
-# make branch in libvirt
-        ssh xen@xenbits.xen.org
-        cd ~/git/libvirt.git/
-	git branch osstest/frozen/xen-$v-testing   xen-tested-master
-
-# make branches in xenbits.xen.org xen.git
-        ssh xen@xenbits.xen.org
-        cd ~/git/xen.git
-	git branch staging-$v staging
-	git branch stable-$v master
-
-# update xendocs@xenbits docs generator to generate new stable branch
-#  docs too. commit to git.
-* make 13:37 <ijc> http://xenbits.xen.org/docs/4.2-testing/ is now live true
-#14:17 <ijc> HOWTO: login to xenbits. become "xendocs" . cd cronjobs . edit
-#            xenbits-docs-all.sh in the obvious way. git commit
-	ssh root@xenbits.xen.org
-	su - xendocs
-	cd cronjobs
-	ed xenbits-docs-all.sh
-	/for branch
-	s/$/ 4.6-testing
-	# ^ OR SIMILAR
-	w
-	q
-        git add -p
-	git commit -m "Branch for $v"
-
-### * make symlink on mariner for qemu
-###        cd /var/www/git/
-###        ln -s /usr/groups/xencore/HG/qemu-xen-$v-testing.git .
-
-* make branches etc. in osstest
-        ssh osstest@osstest.test-lab
-	cd testing.git
-	OSSTEST_CONFIG=production-config ./mg-branch-setup xen-$v-testing bisect
-	OSSTEST_CONFIG=production-config ./mg-branch-setup qemu-upstream-$v-testing bisect
-
-* add branch to osstest
-        ie add both eg qemu-upstream-4.2-testing and xen-4.2-testing to BRANCHES in cr-for-branches
-
-* add to patchbot
-        on xenbits
-        cd ~/HG/patchbot/
-
-	cp xen--master.patchbot-reported-heads xen--stable-$v.patchbot-reported-heads
-	cp xen--staging.patchbot-reported-heads xen--staging-$v.patchbot-reported-heads
-        cp qemu-xen--master.patchbot-reported-heads  qemu-xen--stable-$v.patchbot-reported-heads
-        cp qemu-xen--staging.patchbot-reported-heads  qemu-xen--staging-$v.patchbot-reported-heads
-        cp qemu-xen-traditional--master.patchbot-reported-heads qemu-xen-traditional--stable-$v.patchbot-reported-heads
-
-        #emacs versions
-	perl -i~ -pe 'next unless m/\b\Q'$ov'\E\b/; $x=$_; $x=~ s/\b\Q'$ov'\E\b/'$v'/g; print $x;' versions
-        git diff
-	git add versions
-	git commit -m "Branch for $v"
-
-#* update xenbits web page
-        ssh root@xenbits.xen.org
-        cd /var/xenbits-www/html
-        emacs index.html
-	# - search for previous version number, and update in each place found
-	# - in general, drop one old release in favour of the new one
-
-Ensure references to qemu trees in xen.git's Config.mk are updated.
-Check this with
-        grep unstable Config.mk 
-which should produce no output.  Replace as necessary.
-
-Update new stable tree's MAINTAINERS to contain correct info for this stable branch
-
-###* fix new trees' vcs descriptions
-#* make old trees' descriptions "historical"
-#	cd ~/git
-#	perl -i~ -pe "s/unstable/4.6-testing/" qemu-upstream-$v-testing.git/description
-
-----
 
 * check, even for point releases
 *  http://logs.test-lab.xenproject.org/osstest/results/all-branch-statuses.txt
-- 
2.1.4


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

Re: [PATCH 3/4] misc/release-checklist: Split out branching-checklist.txt

[Jan Beulich]

>>> On 09.03.17 at 16:19, <ian.jackson@eu.citrix.com> wrote:
> --- /dev/null
> +++ b/misc/branching-checklist.txt
> @@ -0,0 +1,97 @@
> +v=4.1
> +ov=4.0
> +
> +##* tag branchpoint
> +##        hg tag $v.0-branched
> +##        hg sign -k 'Xen tree' 4.1.0-branched

Does this Mercurial stuff need keeping?

> +* make branch in qemu-iwj.git
> +        git-branch $v-testing master
> +
> +# make branches in xenbits.xen.org qemus
> +        ssh xen@xenbits.xen.org 
> +	cd ~/git/qemu-xen.git
> +	git branch staging-$v staging
> +	git branch stable-$v master
> +	cd ~/git/qemu-xen-traditional.git
> +	git branch stable-$v master
> +
> +# make branch in libvirt
> +        ssh xen@xenbits.xen.org 
> +        cd ~/git/libvirt.git/
> +	git branch osstest/frozen/xen-$v-testing   xen-tested-master
> +
> +# make branches in xenbits.xen.org xen.git
> +        ssh xen@xenbits.xen.org 
> +        cd ~/git/xen.git
> +	git branch staging-$v staging
> +	git branch stable-$v master
> +
> +# update xendocs@xenbits docs generator to generate new stable branch
> +#  docs too. commit to git.
> +* make 13:37 <ijc> http://xenbits.xen.org/docs/4.2-testing/ is now live true
> +#14:17 <ijc> HOWTO: login to xenbits. become "xendocs" . cd cronjobs . edit
> +#            xenbits-docs-all.sh in the obvious way. git commit
> +	ssh root@xenbits.xen.org 
> +	su - xendocs
> +	cd cronjobs
> +	ed xenbits-docs-all.sh
> +	/for branch
> +	s/$/ 4.6-testing
> +	# ^ OR SIMILAR
> +	w
> +	q
> +        git add -p
> +	git commit -m "Branch for $v"
> +
> +### * make symlink on mariner for qemu
> +###        cd /var/www/git/
> +###        ln -s /usr/groups/xencore/HG/qemu-xen-$v-testing.git .

This also looks to be Mercurial related.

Jan


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

Re: [PATCH 3/4] misc/release-checklist: Split out branching-checklist.txt

[Ian Jackson]

Jan Beulich writes ("Re: [PATCH 3/4] misc/release-checklist: Split out branching-checklist.txt"):
> On 09.03.17 at 16:19, <ian.jackson@eu.citrix.com> wrote:
> > +##* tag branchpoint
> > +##        hg tag $v.0-branched
> > +##        hg sign -k 'Xen tree' 4.1.0-branched
> 
> Does this Mercurial stuff need keeping?

No.  But, I think I would prefer to clean this out when I (or someone
else) next goes through this checklist, rather than proactively.  This
kind of thing is really easy to get right when you're actually doing
it.

Ian.

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

[PATCH 4/4] misc/branching-checklist: Call mg-branch-setup in Cambridge too

[Ian Jackson]

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 misc/branching-checklist.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/misc/branching-checklist.txt b/misc/branching-checklist.txt
index c905383..8899432 100644
--- a/misc/branching-checklist.txt
+++ b/misc/branching-checklist.txt
@@ -54,6 +54,12 @@ ov=4.0
 	OSSTEST_CONFIG=production-config ./mg-branch-setup xen-$v-testing bisect
 	OSSTEST_CONFIG=production-config ./mg-branch-setup qemu-upstream-$v-testing bisect
 
+# make branches etc. in Cambridge osstest
+        ssh osstest@osstest.xs.citrite.net
+	cd testing.git
+	OSSTEST_CONFIG=production-config-cambridge ./mg-branch-setup xen-$v-testing bisect
+	OSSTEST_CONFIG=production-config-cambridge ./mg-branch-setup qemu-upstream-$v-testing bisect
+
 * add branch to osstest
         ie add both eg qemu-upstream-4.2-testing and xen-4.2-testing to BRANCHES in cr-for-branches
 
-- 
2.1.4


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

Re: [PATCH 0/4] misc/release-checklist: Updates prompted by recent release

[Jan Beulich]

>>> On 09.03.17 at 16:19, <ian.jackson@eu.citrix.com> wrote:
> When doing the recent stable release branches, I tripped over some
> deficiencies in these checklists.  And, now that they are in git, we
> can much more safely throw away a lot of ancient stuff.
> 
> Please shout if you have any objections.  I hope to push this today.

No objections; I've just sent a few minor comments.

Jan


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