From e661a3775d908830eff4a4104b0a570923c474a0 Mon Sep 17 00:00:00 2001 From: Jose Miguel Guzman Date: Wed, 5 May 2021 11:21:01 -0400 Subject: [PATCH 1/2] TSC aproval process --- 01-workflow-osm-tools.md | 57 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/01-workflow-osm-tools.md b/01-workflow-osm-tools.md index 0479d8f..63c4273 100644 --- a/01-workflow-osm-tools.md +++ b/01-workflow-osm-tools.md @@ -255,6 +255,63 @@ Link: (you can navigate there 1. Other **contributors** and **MDG Committers** can comment the new contribution and vote using **“Code-Review”** (-1, 0, +1) on **Gerrit**. 2. The **MDG Leader** can comment the new contribution and votes using **“Code-Review”** (-2, -1, 0, +1, +2) on **Gerrit**. +## Code Merging + +Code submitted to Gerrit, will be merged only after getting +- Code Review >= +2 +- Verified >= +1 + +For code changes belonging to a specific module, +the MDL will review and (if approved) will +- provide `Code Review: +2`, +- merge the change. + +### Approval from TSC + +Explicit approval from TSC is required for code changes that +- do not belong to a specific module, or +- that affect several modules (and therefore, need to synchronize changes in those modules), or +- that affect any of the OSM models (such as the IM), or +- belong to a module not led by a MDL, + +To get TSC approval for your changes, please +1. Get at least two +1 votes from other community members +1. Send an e-mail to `OSM_TSC@list.etsi.org` +with subject `APPROVAL: {change summary}` indicating in body + 1. **Change(s)** + + Link to the change(s) in gerrit. + + 1. **Purpose** + + Purpose and benefits of the change (brief, one line is ok) + + 1. **References** + + Including references to the related bug or feature. + + 1. **Other modules impacted** + + Other modules that will/might be impacted (or None). + + This is not only for impact due to code dependencies, + but any impact in OSM functionality. + + This is important to evaluate the risks of the change(s), + communicate them and coordinate mitigation. + + NOTE: + - Indicate, if any other changes need to be merged **before** or **at the same time** than this one + - Indicate if due to the complexity of the change (that might require coordinated work on different modules), + a **dedicated branch** is recommended. + +TSC wil review, and provide `Code Review: +2` if approved. + +Please, note: + +- TSC will not cherry-pick to specific branches + If you need the changes in several branches, include those in the Approval Request. + ## Amending a contribution in Gerrit Before amending, make sure that you have the commit-msg hook installed in your local repo. For instance, if your user is "user" and the repo is the "devops" repo, the command to install the commit-msg hook would be: -- GitLab From c5d0d75d4ee53a52bac34aefdb1c502317d5bf49 Mon Sep 17 00:00:00 2001 From: Jose Miguel Guzman Date: Tue, 25 May 2021 09:15:41 -0400 Subject: [PATCH 2/2] applies comments from TSC and MDLs --- 01-workflow-osm-tools.md | 41 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/01-workflow-osm-tools.md b/01-workflow-osm-tools.md index 63c4273..ea35f60 100644 --- a/01-workflow-osm-tools.md +++ b/01-workflow-osm-tools.md @@ -262,35 +262,35 @@ Code submitted to Gerrit, will be merged only after getting - Verified >= +1 For code changes belonging to a specific module, -the MDL will review and (if approved) will -- provide `Code Review: +2`, -- merge the change. +- The change will need a +1 from other committer +- MDL will review and (if approved) will + - provide `Code Review: +2`, + - merge the change. ### Approval from TSC -Explicit approval from TSC is required for code changes that -- do not belong to a specific module, or -- that affect several modules (and therefore, need to synchronize changes in those modules), or -- that affect any of the OSM models (such as the IM), or -- belong to a module not led by a MDL, - +Explicit approval from TSC is required for code changes that affect: +- the repositories in the modules controlled by the TSC, e.g. IM, NBI and SOL005 repos in the IM/NBI module +- any other repositories under control of a module when there is no MDL (e.g. because the MDL stepped down and there is no interim MDL) + To get TSC approval for your changes, please 1. Get at least two +1 votes from other community members -1. Send an e-mail to `OSM_TSC@list.etsi.org` -with subject `APPROVAL: {change summary}` indicating in body +2. Send an e-mail to `OSM_MDL@list.etsi.org` +with subject `[TSC APPROVAL] {change summary}` indicating in body +``` 1. **Change(s)** Link to the change(s) in gerrit. - 1. **Purpose** + 2. **Purpose** Purpose and benefits of the change (brief, one line is ok) - 1. **References** + 3. **References** Including references to the related bug or feature. - 1. **Other modules impacted** + 4. **Other modules impacted** Other modules that will/might be impacted (or None). @@ -299,18 +299,17 @@ with subject `APPROVAL: {change summary}` indicating in body This is important to evaluate the risks of the change(s), communicate them and coordinate mitigation. - +``` NOTE: - - Indicate, if any other changes need to be merged **before** or **at the same time** than this one + - Indicate if any other changes need to be merged **before** or **at the same time** than this one - Indicate if due to the complexity of the change (that might require coordinated work on different modules), - a **dedicated branch** is recommended. + a **dedicated branch** is recommended (this requires an extra process, therefore, use only when required) + - Indicate If the change needs to be applied in other branches, and include the cherry-picks in the **Changeqs(s)** section + - TSC **will not cherry-pick** to specific branches + If you need the changes in several branches, include those in the Approval Request. TSC wil review, and provide `Code Review: +2` if approved. -Please, note: - -- TSC will not cherry-pick to specific branches - If you need the changes in several branches, include those in the Approval Request. ## Amending a contribution in Gerrit -- GitLab