Merge lp:~brendan-donegan/checkbox/release_docs_improve into lp:checkbox

Proposed by Brendan Donegan
Status: Work in progress
Proposed branch: lp:~brendan-donegan/checkbox/release_docs_improve
Merge into: lp:checkbox
Diff against target: 58 lines (+15/-26)
1 file modified
checkbox-ng/docs/release.rst (+15/-26)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/release_docs_improve
Reviewer Review Type Date Requested Status
Checkbox Developers Pending
Review via email: mp+204752@code.launchpad.net

Description of the change

Please DO NOT MERGE until https://code.launchpad.net/~brendan-donegan/checkbox/manage_release/+merge/204478 has been succesfully merged.

A couple of simple improvements to the release process documentation:

1.) Link to the Certification Self-Testing guide on C3 so that people know how to run checkbox-certification-client.
2.) Strip out all the verbose release cutting steps and show people how to use manage_release (which is in the branch above)

To post a comment you must log in.
2637. By Brendan Donegan

Replace the very verbose command line steps which were used to cut the release with simple calls to the utility script manage_release.

Signed-off-by: Brendan Donegan <email address hidden>

Unmerged revisions

2637. By Brendan Donegan

Replace the very verbose command line steps which were used to cut the release with simple calls to the utility script manage_release.

Signed-off-by: Brendan Donegan <email address hidden>

2636. By Brendan Donegan

Point to the Certification Self-Testing guide in the release process documentation where we talk about how to test the release. Note that it is NOT necessary to have an account on C3 to download the document, so we don't need to advise about that.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox-ng/docs/release.rst'
2--- checkbox-ng/docs/release.rst 2014-01-29 14:04:54 +0000
3+++ checkbox-ng/docs/release.rst 2014-02-05 16:25:18 +0000
4@@ -66,31 +66,17 @@
5
6 In order to cut the release, we have to merge the changes from trunk into the
7 release branch, commit them with a suitable message and update the changelog in
8-trunk so that future changes go under the correct version. For each combination
9-of branches shown above, do the following (the example uses ``lp:checkbox`` and
10-``lp:checkbox/release``)::
11-
12- bzr branch lp:checkbox/release checkbox-release
13- bzr branch lp:checkbox checkbox-trunk
14- cd checkbox-release
15- current_stable=`head -n1 $(find . -name 'changelog') | grep -oP '(?<=\().*(?=\))'`
16- bzr merge lp:checkbox
17-
18-at this point if no changes (other than one to ``debian/changelog``) get merged
19-in then we do not perform a release of the package in question. In practice
20-this often happens with ``checkbox-certification`` but never with
21-``checkbox``::
22-
23- bzr commit -m "Merged in changes from rev$(bzr revno -r tag:$current_stable lp:checkbox) to rev$(bzr revno lp:checkbox) from lp:checkbox"
24- bzr push lp:checkbox/release
25- cd `find . -name 'debian'`; cd ..
26- bzr tag `head -n1 debian/changelog | grep -oP '(?<=\().*(?=\))'`
27- dch -r (save modified changelog)
28- dch -i -U 'Incremented changelog'
29- debcommit
30- bzr push lp:checkbox
31-
32-The last step in the process is to perform a build of the packages in the
33+trunk so that future changes go under the correct version. Luckily we have a
34+script which does this for us, making this process fast and reliable.
35+
36+Get a copy of the checkbox source and run the following from the root::
37+
38+ support/manage_release prepare checkbox
39+ support/manage_release prepare checkbox-certification
40+ support/manage_release prepare checkbox-packaging
41+
42+These take a little while to run, but once they are done the last step in the
43+process is to simply perform a build of the packages in the
44 ``ppa:checkbox-dev/testing PPA``. To do this we need to go to the recipe pages
45 for the ``checkbox`` and/or ``checkbox-certification`` release branches.
46
47@@ -155,7 +141,10 @@
48 to be tested is ``checkbox-certification-client`` and
49 ``checkbox-certification-server`` which form the basis for CE QAs OEM specific
50 versions of CheckBox. CheckBox certification server is tested in the CI loop
51-CheckBox certification client needs to be tested manually.
52+CheckBox certification client needs to be tested manually. This should be done
53+according to the instructions in the `Certification Self-Testing Guide
54+<https://certification.canonical.com/static/docs/Ubuntu_Desktop_Certified_
55+Hardware_Self-Testing_Guide.pdf>`_.
56
57 Release Meeting
58 ===============

Subscribers

People subscribed via source and target branches