Project

General

Profile

HOWTO » History » Version 9

Loïc Dachary, 03/26/2015 09:21 AM

1 2 Loïc Dachary
h3. HOWTO backport
2 1 Loïc Dachary
3
Based on what would be done for the Giant branch
4
5 9 Loïc Dachary
[[HOWTO update the inventory]]
6 1 Loïc Dachary
7 8 Loïc Dachary
h3. Major release (e.g. first hammer release) QA suites results, open issues summarization process
8 7 Yuri Weinstein
9
* all planned features were committed to the branch
10
* ceph QA suites are being executed by "nightlies" (crontab teuthology@theuthology in Sepia lab)
11
* a new section is added to the http://tracker.ceph.com/rb/master_backlog/ceph-releases# , as for example for "hammer v0.94.1" with version number
12
* all suites listed as tasks and results summaries + related tickets are listed there
13
* as suite passed, and all issues resolved, the task is marked a resolved and thus indicates readiness for the final release cut   
14
15 1 Loïc Dachary
h3. Backport issues
16
17
The helper snippet at http://workbench.dachary.org/dachary/ceph-workbench/issues/3 can be used to semi automate the process below
18
19
* For each entry at http://workbench.dachary.org/ceph/ceph-backports/wikis/giant#issues-that-need-backporting
20
* git cherry-pick -x the commits from the pull request that was targettig master (not from the pull requests targeting stable branches)
21
* create a pull request with the backport with a reference to the issue and set the milestone to giant
22
* add a reference to the pull request in the issue
23
* if the make check bot finds a problem, fix it
24
25 2 Loïc Dachary
h3. Collect pending pull requests into an integration branch
26 1 Loïc Dachary
27
The snippet at http://workbench.dachary.org/dachary/ceph-workbench/issues/4 can help
28
29
* create a giant-backport branch
30
* fetch all pull requests from github
31
* git merge all pull requests
32
* modify the pull requests individually to fix merge conflicts (i.e. they must merge cleanly, which may involving aggregating two pull requests into a single one designed to properly resolve the conflict)
33
* compile with ./autogen.sh ; ./configure ; make -j4
34
* modify the pull requests individually to fix compilation errors
35 3 Loïc Dachary
36
h3. Format of teuthology analysis entries
37
38
For instance http://tracker.ceph.com/issues/11153#rgw is structured like so:
39
40
* In chronological order
41
* The command line (that can be copy/pasted) used to run the suite
42
* A bullet point with the URL to the suite run in pulpito prefixed by
43
** *running* if the run is not complete
44
** *red* if the run has at least one error
45
** *green* if the run has no error
46 4 Loïc Dachary
* If the run has at least one error, the output of the fail formatter snippet (found at http://workbench.dachary.org/dachary/ceph-workbench/issues/2 is appened to it) is added and edited when the errors are analyzed
47 6 Loïc Dachary
* When an error is analyzed, the link to the error is prefixed with
48
** *environmental noise* if it must be run again because it failed for reasons unrelated to the test itself (DNS error etc.)
49
** *known bug* and a URL to the bug (not just the number of the bug)
50
** *new bug* and a URL to the newly created bug if it was discovered during the analysis of this error: it is likely to be a regression
51 5 Loïc Dachary
52
h3. Synchronized repositories
53
54
When running teuthology tests for a given branch (say giant), the "ceph-qa-suite":https://github.com/ceph/ceph-qa-suite branch must match. In the simplest case it is enough to write:
55
<pre>
56
teuthology-suite --suite-branch giant ... --ceph giant ...
57
</pre>
58
When a Ceph pull request (for instance "rgw acl response should start with <?xml version=1.0 ?>":https://github.com/ceph/ceph/pull/4082) needs to be synchronized with a ceph-qa-suite pull request (for instance "create a new get_acl helper to ensure proper xml is compared":https://github.com/ceph/ceph-qa-suite/pull/370), dedicated branches must be created in the Ceph and ceph-qa-suite repositories. For instance:
59
<pre>
60
teuthology-suite --suite-branch wip-rgw-acl-giant ... --ceph giant-backports ...
61
</pre>
62
Note that it is not possible to specify a branch that is outside of the Ceph or ceph-qa-suite repositories: write access to these repositories is necessary.
63
64
For S3 tests an additional repository must be synchronized in a similar way https://github.com/ceph/s3-tests: there must exist a branch with the same name as the branch specified with **--suite-branch**. For instance the "ceph-qa-suite wip-rgw-acl-giant":https://github.com/ceph/ceph-qa-suite/tree/wip-rgw-acl-giant branch must have a "s3-test wip-rgw-acl-giant":https://github.com/ceph/s3-tests/tree/wip-rgw-acl-giant counterpart.