diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2015-07-14 17:58:33 +0800 |
|---|---|---|
| committer | chenshuai@huawei.com <chenshuai@huawei.com> | 2015-07-14 17:58:33 +0800 |
| commit | e46b14b266089d203081bdc5a09597f847f0757d (patch) | |
| tree | ae757e19d23a690037151ac3388d41c745ba0d6c | |
| parent | c1c033a9ea0c3dd2ca7227bcde6e6e2e5d6c3bb1 (diff) | |
Document how to work with stable/arno
JIRA: OCTO-76
Change-Id: I6a3a5b37916a21dcdd276fb92e27557cdb03e5d4
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
| -rw-r--r-- | docs/opnfv-stablebranch.rst | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/docs/opnfv-stablebranch.rst b/docs/opnfv-stablebranch.rst index ec74cf0..f1b7efa 100644 --- a/docs/opnfv-stablebranch.rst +++ b/docs/opnfv-stablebranch.rst @@ -97,6 +97,7 @@ The best way to get the patch merged in timely manner is to send it backported b If the patch you're proposing will not cherry-pick cleanly, you can help by resolving the conflicts yourself and proposing the resulting patch. Please keep Conflicts lines in the commit message to help reviewers! You can use git-review to propose a change to the stable branch with:: + $> git log (find out the commit id of the patch that you want to backport from "git log" output) $> git checkout stable/arno $> git cherry-pick -x $master_commit_d $> git review stable/arno @@ -133,10 +134,23 @@ will be introduced when we see the need. CI Pipeline ~~~~~~~~~~~ -Octopus team will setup separate pipeline for merge-, build-, verify-jobs. - For Arno release the jobs will be run once per day per installer (Fuel and Foreman) on stable/arno branch. Since this is in addition to the jobs for master branch and jobs have long run time, this might need re-evaluation as we go on. +The artifacts arno/stable jobs produced are stored in the new directoies on artifacts.opnfv.org. + +The artifacts produced by daily jobs would be stored + For stable/arno, the storage locations will be <project_name>/arno/<artifact_name>.iso +The docs produced by daily and merge jobs would be stored + For stable/arno, the storage locations will be <project_name>/arno/docs/<document_name> + +No changes in overall functionality in merge and verify jobs: they will continue doing builds only :: + + genesis-fuel-verify-master, genesis-fuel-verify-stable-arno, + genesis-fuel-merge-master, genesis-fuel-merge-stable-arno, + genesis-foreman-verify-master, genesis-foreman-verify-stable-arno, + genesis-foreman-merge-master, genesis-foreman-merge-stable-arno + + Team organization ----------------- @@ -171,4 +185,4 @@ All you really need is some time and the ability to apply the "safe source of hi If you'd like to join the team, you can start by simply [+-]1ing stable branch reviews. It's best if you can add some brief thoughts to your review on why you think the fix is suitable for stable so that we know how you're applying the policy. -Same as in normal OPNFV projects, stable-mtc team will use committer votes for some decisions like proposing a new point release to TSC.
\ No newline at end of file +Same as in normal OPNFV projects, stable-mtc team will use committer votes for some decisions like proposing a new point release to TSC. |