Skip to content

Commit

Permalink
Merge pull request ceph#4315 from dachary/wip-workflow
Browse files Browse the repository at this point in the history 
doc: development workflows

Reviewed-by: Alistair Israel <[email protected]>
  • Loading branch information
Loic Dachary committed Apr 9, 2015
2 parents 21f60a9 + b09b458 commit 9046a3e
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 80 deletions.
29 changes: 26 additions & 3 deletions doc/dev/development-workflow.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,31 @@ following differences:
Cutting a new stable release
============================

When all bugs with severity ``Critical`` are fixed for the release
being prepared, it is published as follows:

A new stable release can be cut when:

* all bugs with severity ``Critical`` are fixed
* integration and upgrade tests run successfully

Publishing a new stable release implies a risk of regression or
discovering new bugs during the upgrade, no matter how carefully it is
tested. The decision to cut a release must take this into account: it
may not be wise to publish a stable release that only fixes a few
minor bugs. For instance if only one commit has been backported to a
stable release that is not a LTS, it is better to wait until there are
more.

When a stable release reaches its end of life, it may be safer to
recommend an upgrade to the next long term support release instead of
proposing a new point release to fix a problem. For instance, the
Dumpling v0.67.11 release has bugs related to backfilling which have
been fixed in Firefly v0.80.x. A backport fixing these backfilling
bugs has been tested in the draft point release Dumpling v0.67.12 but
they are large enough to introduce a risk of regression. As Dumpling
is approaching its end of life, users suffering from this bug can
upgrade to Firefly to fix it. Unless users manifest themselves and ask
for Dumpling v0.67.12, this draft release may never be published.

* The ``Ceph lead`` decides a new stable release must be published
* The ``release master`` gets approval from all leads
* The ``release master`` writes and commits the release notes
* The ``release master`` informs the ``quality engineer`` that the
Expand All @@ -186,6 +208,7 @@ being prepared, it is published as follows:

The person responsible for each role is:

* Sage Weil is the ``Ceph lead``
* Sage Weil is the ``release master`` for major stable releases
(Firefly 0.80, Giant 0.87 etc.)
* Loic Dachary is the ``release master`` for stable point releases
Expand Down
159 changes: 82 additions & 77 deletions doc/releases.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Release timeline
================

There are approximately four stable releases a year. Every other
There are approximately three stable releases a year. Every other
release is a LTS (Long Term Support). A LTS release is supported for 18
months. A stable release that is not LTS is supported until the next
stable release is published. A development / testing release is not
Expand All @@ -27,82 +27,87 @@ Supporting a release means:
* The `stable releases and backport team <http://tracker.ceph.com/projects/ceph-releases>`_
publishes ``point releases`` including fixes that have been backported to the release.

+----------------+-----------+-----------+-----------+-----------+-----------+
| |Development|`Dumpling`_|`Emperor`_ |`Firefly`_ |`Giant`_ |
| |Testing |LTS |Stable |LTS |Stable |
+----------------+-----------+-----------+-----------+-----------+-----------+
| March 2015 | | | |`0.80.9`_ | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| February 2015 |`0.93`_ | | | |`0.87.1`_ |
| +-----------+-----------+-----------+-----------+-----------+
| |`0.92`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| January 2015 |`0.91`_ | | |`0.80.8`_ | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| December 2014 |`0.90`_ | | | | |
| +-----------+-----------+-----------+-----------+-----------+
| |`0.89`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| November 2014 |`0.88`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| October 2014 |`0.86`_ | | |`0.80.7`_ |`0.87`_ |
| +-----------+-----------+-----------+-----------+-----------+
| | | | |`0.80.6`_ | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| September 2014 |`0.85`_ |`0.67.11`_ | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| August 2014 |`0.84`_ |`0.67.10`_ | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| July 2014 |`0.83`_ | | |`0.80.5`_ | |
| +-----------+-----------+-----------+-----------+-----------+
| | | | |`0.80.4`_ | |
| +-----------+-----------+-----------+-----------+-----------+
| | | | |`0.80.3`_ | |
| +-----------+-----------+-----------+-----------+-----------+
| | | | |`0.80.2`_ | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| June 2014 |`0.82`_ | | | | |
| +-----------+-----------+-----------+-----------+-----------+
| |`0.81`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| May 2014 | |`0.67.9`_ | |`0.80.1`_ | |
| +-----------+-----------+-----------+-----------+-----------+
| | |`0.67.8`_ | |`0.80`_ | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| April 2014 |`0.79`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| March 2014 |`0.78`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| February 2014 |`0.77`_ |`0.67.7`_ | | | |
| +-----------+-----------+-----------+-----------+-----------+
| | |`0.67.6`_ | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| January 2014 |`0.76`_ | | | | |
| +-----------+-----------+-----------+-----------+-----------+
| |`0.75`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| December 2013 |`0.74`_ |`0.67.5`_ |`0.72.2`_ | | |
| +-----------+-----------+-----------+-----------+-----------+
| |`0.73`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| November 2013 | | |`0.72.1`_ | | |
| +-----------+-----------+-----------+-----------+-----------+
| | | |`0.72`_ | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| October 2013 |`0.71`_ |`0.67.4`_ | | | |
| +-----------+-----------+-----------+-----------+-----------+
| |`0.70`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| September 2013 |`0.69`_ | | | | |
| +-----------+-----------+-----------+-----------+-----------+
| |`0.68`_ |`0.67.3`_ | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
| August 2013 | |`0.67.2`_ | | | |
| +-----------+-----------+-----------+-----------+-----------+
| | |`0.67.1`_ | | | |
| +-----------+-----------+-----------+-----------+-----------+
| | |`0.67`_ | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| |Development|`Dumpling`_|`Emperor`_ |`Firefly`_ |`Giant`_ |`Hammer`_ |
| |Testing |LTS |Stable |LTS |Stable |LTS |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| April 2015 | | | | | |`0.94`_ |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| March 2015 | | | |`0.80.9`_ | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| February 2015 |`0.93`_ | | | |`0.87.1`_ | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| |`0.92`_ | | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| January 2015 |`0.91`_ | | |`0.80.8`_ | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| December 2014 |`0.90`_ | | | | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| |`0.89`_ | | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| November 2014 |`0.88`_ | | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| October 2014 |`0.86`_ | | |`0.80.7`_ |`0.87`_ | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| | | | |`0.80.6`_ | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| September 2014 |`0.85`_ |`0.67.11`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| August 2014 |`0.84`_ |`0.67.10`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| July 2014 |`0.83`_ | | |`0.80.5`_ | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| | | | |`0.80.4`_ | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| | | | |`0.80.3`_ | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| | | | |`0.80.2`_ | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| June 2014 |`0.82`_ | | | | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| |`0.81`_ | | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| May 2014 | |`0.67.9`_ | |`0.80.1`_ | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| | |`0.67.8`_ | |`0.80`_ | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| April 2014 |`0.79`_ | | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| March 2014 |`0.78`_ | | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| February 2014 |`0.77`_ |`0.67.7`_ | | | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| | |`0.67.6`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| January 2014 |`0.76`_ | | | | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| |`0.75`_ | | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| December 2013 |`0.74`_ |`0.67.5`_ |`0.72.2`_ | | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| |`0.73`_ | | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| November 2013 | | |`0.72.1`_ | | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| | | |`0.72`_ | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| October 2013 |`0.71`_ |`0.67.4`_ | | | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| |`0.70`_ | | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| September 2013 |`0.69`_ | | | | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| |`0.68`_ |`0.67.3`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+
| August 2013 | |`0.67.2`_ | | | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| | |`0.67.1`_ | | | | |
| +-----------+-----------+-----------+-----------+-----------+-----------+
| | |`0.67`_ | | | | |
+----------------+-----------+-----------+-----------+-----------+-----------+-----------+

.. _0.94: ../release-notes#v0-94-hammer
.. _Hammer: release-notes#v0-94-hammer

.. _0.93: ../release-notes#v0-93
.. _0.92: ../release-notes#v0-92
Expand Down

0 comments on commit 9046a3e

Please sign in to comment.