@@ -24,7 +24,7 @@ particular code base areas or subsystems.
2424
2525
2626Contributor
27- ###########
27+ +++++++++++
2828
2929A *Contributor * is a developer who wishes to contribute to the project,
3030at any level. Contributors who show dedication and skill are rewarded with
@@ -50,7 +50,7 @@ Contributors are granted the following rights and responsibilities:
5050 (https://github.com/zephyrproject-rtos/zephyr/blob/master/CODE_OF_CONDUCT.md)
5151
5252Collaborator
53- ############
53+ ++++++++++++
5454
5555A *Collaborator * is a Contributor who is also responsible for the maintenance
5656of Zephyr source code. Their opinions weigh more when decisions are made, in a
@@ -70,7 +70,7 @@ in addition to those listed for Contributors:
7070 process, when those happen.
7171
7272Maintainer
73- ##########
73+ ++++++++++
7474
7575A *Maintainer * is a Collaborator who is also responsible for knowing,
7676directing and anticipating the needs of a given zephyr source code area.
@@ -105,10 +105,10 @@ Role Retirement
105105
106106
107107Teams and Supporting Activities
108- *******************************
108+ ###############################
109109
110110Assignee
111- ########
111+ ++++++++
112112
113113An *Assignee * is one of the maintainers of a subsystem or code being changed.
114114Assignees are set either automatically based on the code being changed or set
@@ -125,7 +125,7 @@ the latter is not possible.
125125* Responsibility to drive the escalation process
126126
127127Release Engineering Team
128- ########################
128+ ++++++++++++++++++++++++
129129
130130A team of active Maintainers involved in multiple areas.
131131
@@ -161,13 +161,53 @@ Joining the Release Engineering team
161161 geographically distributed across multiple locations and
162162 time-zones).
163163
164- Release Activity
165- ################
166164
167- .. figure :: img/img_release_activity.png
168- :width: 663px
169- :align: center
170- :alt: Release Activity
165+ Release Manager
166+ +++++++++++++++
167+
168+ A *Maintainer * responsible for driving a specific release to
169+ completion following the milestones and the roadmap of the
170+ project for this specific release.
171+
172+ * TSC has to approve a release manager.
173+
174+ A Release Manager is a member of the Release Engineering team and has
175+ the rights and responsibilities of that team in addition to
176+ the following:
177+
178+ * Right to manage and coordinate all code merges after the
179+ code freeze milestone (M3, see `program management overview <https://wiki.zephyrproject.org/Program-Management >`_.)
180+ * Responsibility to drive and coordinate the triaging process
181+ for the release
182+ * Responsibility to create the release notes of the release
183+ * Responsibility to notify all stakeholders of the project,
184+ including the community at large about the status of the
185+ release in a timely manner.
186+ * Responsibility to coordinate with QA and validation and
187+ verify changes either directly or through QA before major
188+ changes and major milestones.
189+
190+ Roles / Permissions
191+ +++++++++++++++++++
192+
193+ .. table :: Project Roles vs Github Permissions
194+ :widths: 20 20 10 10 10 10 10
195+ :align: center
196+
197+ ================ =================== =========== ================ =========== =========== ============
198+ .. .. **Admin ** **Merge Rights ** Member Owner Collaborator
199+ ---------------- ------------------- ----------- ---------------- ----------- ----------- ------------
200+ Main Roles Contributor x
201+ ---------------- ------------------- ----------- ---------------- ----------- ----------- ------------
202+ .. Collaborator x
203+ ---------------- ------------------- ----------- ---------------- ----------- ----------- ------------
204+ .. Maintainer x
205+ Supportive Roles QA/Validation x x
206+ .. DevOps **x **
207+ .. System Admin **x ** x
208+ .. Release Engineering **x ** **x ** x
209+
210+ ================ =================== =========== ================ =========== =========== ============
171211
172212
173213MAINTAINERS File
@@ -222,8 +262,16 @@ Generic guidelines for deciding and filling in the Maintainers' list
222262 implementation
223263
224264
265+ Release Activity
266+ ################
267+
268+ .. figure :: img/img_release_activity.png
269+ :width: 663px
270+ :align: center
271+ :alt: Release Activity
272+
225273Merge Criteria
226- ##############
274+ ++++++++++++++
227275
228276* All continuous integration checks have passed
229277
@@ -260,7 +308,7 @@ Merge Criteria
260308* All required checks are passing
261309
262310Escalation Process
263- ##################
311+ ++++++++++++++++++
264312
265313* Contributors may object to change requests or decisions made by
266314 Maintainers.
@@ -280,51 +328,3 @@ Escalation Process
280328 a binding resolution in the TSC.
281329 * Assignee to ensure the resolution of the escalation is
282330 reflected in the PR review.
283-
284-
285- Release Manager
286- ###############
287-
288- A *Maintainer * responsible for driving a specific release to
289- completion following the milestones and the roadmap of the
290- project for this specific release.
291-
292- * TSC has to approve a release manager.
293-
294- A Release Manager is a member of the Release Engineering team and has
295- the rights and responsibilities of that team in addition to
296- the following:
297-
298- * Right to manage and coordinate all code merges after the
299- code freeze milestone (M3, see `program management overview <https://wiki.zephyrproject.org/Program-Management >`_.)
300- * Responsibility to drive and coordinate the triaging process
301- for the release
302- * Responsibility to create the release notes of the release
303- * Responsibility to notify all stakeholders of the project,
304- including the community at large about the status of the
305- release in a timely manner.
306- * Responsibility to coordinate with QA and validation and
307- verify changes either directly or through QA before major
308- changes and major milestones.
309-
310- Roles / Permissions
311- ###################
312-
313- .. table :: Project Roles vs Github Permissions
314- :widths: 20 20 10 10 10 10 10
315- :align: center
316-
317- ================ =================== =========== ================ =========== =========== ============
318- .. .. **Admin ** **Merge Rights ** Member Owner Collaborator
319- ---------------- ------------------- ----------- ---------------- ----------- ----------- ------------
320- Main Roles Contributor x
321- ---------------- ------------------- ----------- ---------------- ----------- ----------- ------------
322- .. Collaborator x
323- ---------------- ------------------- ----------- ---------------- ----------- ----------- ------------
324- .. Maintainer x
325- Supportive Roles QA/Validation x x
326- .. DevOps **x **
327- .. System Admin **x ** x
328- .. Release Engineering **x ** **x ** x
329-
330- ================ =================== =========== ================ =========== =========== ============
0 commit comments