[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] docs: consolidate release related documents



commit 1c1df9b7665a586f9ec5887a627fdae837c3d667
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Mon Jul 31 12:22:46 2017 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Fri Aug 4 12:01:37 2017 +0100

    docs: consolidate release related documents
    
    Move the existing docs from misc to docs/process.
    
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 docs/process/branching-checklist.txt | 103 ++++++++++++++++++++++++++
 docs/process/release-checklist.txt   | 136 +++++++++++++++++++++++++++++++++++
 misc/branching-checklist.txt         | 103 --------------------------
 misc/release-checklist.txt           | 136 -----------------------------------
 4 files changed, 239 insertions(+), 239 deletions(-)

diff --git a/docs/process/branching-checklist.txt 
b/docs/process/branching-checklist.txt
new file mode 100644
index 0000000..8899432
--- /dev/null
+++ b/docs/process/branching-checklist.txt
@@ -0,0 +1,103 @@
+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@xxxxxxxxxxxxxxx
+       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@xxxxxxxxxxxxxxx
+        cd ~/git/libvirt.git/
+       git branch osstest/frozen/xen-$v-testing   xen-tested-master
+
+# make branches in xenbits.xen.org xen.git
+        ssh xen@xxxxxxxxxxxxxxx
+        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@xxxxxxxxxxxxxxx
+       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@xxxxxxxxxxxx-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
+
+# make branches etc. in Cambridge osstest
+        ssh osstest@xxxxxxxxxxxxxxxxxxxxxx
+       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
+
+* 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@xxxxxxxxxxxxxxx
+        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/docs/process/release-checklist.txt 
b/docs/process/release-checklist.txt
new file mode 100644
index 0000000..b96964e
--- /dev/null
+++ b/docs/process/release-checklist.txt
@@ -0,0 +1,136 @@
+
+s=master
+#b=unstable
+v=$v-rc1
+
+OR
+
+x=4.1
+m=1
+rc=-rc2
+
+r=$x.$m
+s=$x-testing
+#b=$x-testing
+v=$r$rc
+
+t=$r$rc
+OR
+t=RELEASE-$r
+
+
+# FIRSTLY
+#  - check (for point releases, but not RCs) all XSAs have been applied (Lars)
+#
+* check, even for point releases
+*  http://logs.test-lab.xenproject.org/osstest/results/all-branch-statuses.txt
+
+
+# QEMU
+
+  git checkout $s
+  git show # should show appropriate intended commit
+  git-tag -u 'Xen.org Xen tree code signing' -m "Xen $v" xen-$v
+
+  git-push xenbits.xen.org:/home/xen/git/qemu-xen-traditional.git $s:stable-$x 
xen-$v
+
+# consider making tag in minios, and updating xen.git Config.mk
+  git checkout SOMETHING
+  git show # should show appropriate intended commit
+  git-tag -u 'xen tree' -s -m "Xen $r$rc" xen-$t
+  git push xen@xxxxxxxxxxxxxxx:/home/xen/git/mini-os.git xen-$t
+
+* Also tag upstream qemu tree (Stefano)
+  git checkout SOMETHING
+  git show # should show appropriate intended commit
+  git tag -u 'xen tree' -s -m "Xen $r$rc" qemu-xen-$v 
+  git push osstest@xxxxxxxxxxxxxxx:/home/xen/git/qemu-xen.git qemu-xen-$v
+
+* consider bumping sonames of shlibs
+
+* change xen-unstable README (should say "Xen 4.5" in releases and on stable 
branches, "Xen 4.5-unstable" on unstable)
+* change xen-unstable Config.mk (QEMU_UPSTREAM_REVISION, 
QEMU_TRADITIONAL_REVISION, MINIOS_UPSTREAM_REVISION)
+* change xen-unstable xen/Makefile XEN_EXTRAVERSION
+# if main version number has changed (eg 4.7 -> 4.8) rerun ./autogen.sh
+* rerun ./autogen.sh to update version number in configure
+#    - XEN_EXTRAVERSION should be `.0-rc$(XEN_VENDORVERSION)'
+#    - debug ?= n on stable branches
+#    - Kconfig.debug default n on stable branches
+* tag xen-unstable
+
+# In xen.git
+  git-fetch origin
+  git-checkout staging-$x
+  git-pull
+  git-show # should show commit updating version to right version
+  git-tag -u 'xen tree' -s -m "Xen $r$rc" $t
+  git-push origin $t
+##  hg tag <tag_name> ; hg sign -k "Xen tree" <tag_name>
+
+
+
+HANDLING TAG GENERATED BY RELEASE MANAGER
+
+   fetch the tag into my tree
+   make the tarball (RELEASE TARBALL, below)
+   test build (see below)
+   website (see below)
+   merge tag into staging and push to staging
+   maybe force push into master
+   definitely push tag to xenbits
+        git-push origin $t
+
+
+
+
+RELEASE TARBALL
+
+   for 4.5 and later, use tarball target
+       git checkout $t
+       git clean -xdff
+       # export http_proxy=http://localhost:3128/
+       ./configure
+       make src-tarball-release   # must be used for actual releases
+       make src-tarball           # uses git-describe (best for RCs)
+        # ^find some way to add git-cache-proxy to this (done in 
~iwj/.gitconfig)
+       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/.
+
+       # website-thing/xen.org is cvs -d 
mail.xenproject.org:/home/downloads-cvs/cvs-repos co xen.org
+       cd /volatile/iwj/website-thing/xen.org
+
+# test build
+                cd /volatile/iwj/d
+                mkdir build
+                cd build
+                tar zxf 
/volatile/iwj/website-thing/xen.org/oss-xen/release/$v/xen-$v.tar.gz
+#                rsync -a --delete xen-$v build/
+                cd xen-$v
+                export http_proxy=http://localhost:3128/
+                (./configure && make -j4 KERNELS='' && echo ok.) 2>&1 | tee 
../log.$v       # post 4.2
+
+# [[ test build amd64 ]]
+
+       cvs add -kb oss-xen/release/$v/
+
+        cd oss-xen/release/$v
+        gpg --digest-algo=SHA256 --detach-sign -u 'xen tree' xen-$v.tar.gz
+       cvs add -kb xen-$v.tar.gz
+        cvs add -kb xen-$v.tar.gz.sig
+        cd ../../..
+
+       cvs ci -m $v
+
+        ssh downloads-cvs@xxxxxxxxxxxxxxxxxxx
+       cd /data/downloads.xenproject.org/xen.org
+       cvs -q up -d
+       # should show something like
+       #   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
+
+
+update xenbits front page to change references to old stable branch
+ into references to new stable branch
+
+Edit website
+
diff --git a/misc/branching-checklist.txt b/misc/branching-checklist.txt
deleted file mode 100644
index 8899432..0000000
--- a/misc/branching-checklist.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-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@xxxxxxxxxxxxxxx
-       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@xxxxxxxxxxxxxxx
-        cd ~/git/libvirt.git/
-       git branch osstest/frozen/xen-$v-testing   xen-tested-master
-
-# make branches in xenbits.xen.org xen.git
-        ssh xen@xxxxxxxxxxxxxxx
-        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@xxxxxxxxxxxxxxx
-       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@xxxxxxxxxxxx-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
-
-# make branches etc. in Cambridge osstest
-        ssh osstest@xxxxxxxxxxxxxxxxxxxxxx
-       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
-
-* 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@xxxxxxxxxxxxxxx
-        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
deleted file mode 100644
index b96964e..0000000
--- a/misc/release-checklist.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-
-s=master
-#b=unstable
-v=$v-rc1
-
-OR
-
-x=4.1
-m=1
-rc=-rc2
-
-r=$x.$m
-s=$x-testing
-#b=$x-testing
-v=$r$rc
-
-t=$r$rc
-OR
-t=RELEASE-$r
-
-
-# FIRSTLY
-#  - check (for point releases, but not RCs) all XSAs have been applied (Lars)
-#
-* check, even for point releases
-*  http://logs.test-lab.xenproject.org/osstest/results/all-branch-statuses.txt
-
-
-# QEMU
-
-  git checkout $s
-  git show # should show appropriate intended commit
-  git-tag -u 'Xen.org Xen tree code signing' -m "Xen $v" xen-$v
-
-  git-push xenbits.xen.org:/home/xen/git/qemu-xen-traditional.git $s:stable-$x 
xen-$v
-
-# consider making tag in minios, and updating xen.git Config.mk
-  git checkout SOMETHING
-  git show # should show appropriate intended commit
-  git-tag -u 'xen tree' -s -m "Xen $r$rc" xen-$t
-  git push xen@xxxxxxxxxxxxxxx:/home/xen/git/mini-os.git xen-$t
-
-* Also tag upstream qemu tree (Stefano)
-  git checkout SOMETHING
-  git show # should show appropriate intended commit
-  git tag -u 'xen tree' -s -m "Xen $r$rc" qemu-xen-$v 
-  git push osstest@xxxxxxxxxxxxxxx:/home/xen/git/qemu-xen.git qemu-xen-$v
-
-* consider bumping sonames of shlibs
-
-* change xen-unstable README (should say "Xen 4.5" in releases and on stable 
branches, "Xen 4.5-unstable" on unstable)
-* change xen-unstable Config.mk (QEMU_UPSTREAM_REVISION, 
QEMU_TRADITIONAL_REVISION, MINIOS_UPSTREAM_REVISION)
-* change xen-unstable xen/Makefile XEN_EXTRAVERSION
-# if main version number has changed (eg 4.7 -> 4.8) rerun ./autogen.sh
-* rerun ./autogen.sh to update version number in configure
-#    - XEN_EXTRAVERSION should be `.0-rc$(XEN_VENDORVERSION)'
-#    - debug ?= n on stable branches
-#    - Kconfig.debug default n on stable branches
-* tag xen-unstable
-
-# In xen.git
-  git-fetch origin
-  git-checkout staging-$x
-  git-pull
-  git-show # should show commit updating version to right version
-  git-tag -u 'xen tree' -s -m "Xen $r$rc" $t
-  git-push origin $t
-##  hg tag <tag_name> ; hg sign -k "Xen tree" <tag_name>
-
-
-
-HANDLING TAG GENERATED BY RELEASE MANAGER
-
-   fetch the tag into my tree
-   make the tarball (RELEASE TARBALL, below)
-   test build (see below)
-   website (see below)
-   merge tag into staging and push to staging
-   maybe force push into master
-   definitely push tag to xenbits
-        git-push origin $t
-
-
-
-
-RELEASE TARBALL
-
-   for 4.5 and later, use tarball target
-       git checkout $t
-       git clean -xdff
-       # export http_proxy=http://localhost:3128/
-       ./configure
-       make src-tarball-release   # must be used for actual releases
-       make src-tarball           # uses git-describe (best for RCs)
-        # ^find some way to add git-cache-proxy to this (done in 
~iwj/.gitconfig)
-       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/.
-
-       # website-thing/xen.org is cvs -d 
mail.xenproject.org:/home/downloads-cvs/cvs-repos co xen.org
-       cd /volatile/iwj/website-thing/xen.org
-
-# test build
-                cd /volatile/iwj/d
-                mkdir build
-                cd build
-                tar zxf 
/volatile/iwj/website-thing/xen.org/oss-xen/release/$v/xen-$v.tar.gz
-#                rsync -a --delete xen-$v build/
-                cd xen-$v
-                export http_proxy=http://localhost:3128/
-                (./configure && make -j4 KERNELS='' && echo ok.) 2>&1 | tee 
../log.$v       # post 4.2
-
-# [[ test build amd64 ]]
-
-       cvs add -kb oss-xen/release/$v/
-
-        cd oss-xen/release/$v
-        gpg --digest-algo=SHA256 --detach-sign -u 'xen tree' xen-$v.tar.gz
-       cvs add -kb xen-$v.tar.gz
-        cvs add -kb xen-$v.tar.gz.sig
-        cd ../../..
-
-       cvs ci -m $v
-
-        ssh downloads-cvs@xxxxxxxxxxxxxxxxxxx
-       cd /data/downloads.xenproject.org/xen.org
-       cvs -q up -d
-       # should show something like
-       #   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
-
-
-update xenbits front page to change references to old stable branch
- into references to new stable branch
-
-Edit website
-
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.