diff --git a/01-workflow-osm-tools.md b/01-workflow-osm-tools.md index 0479d8f386ad684fb0cf44dbbdfad8d97937a637..ea35f604b6bbb4a0a112bf00378f8899f36590ce 100644 --- a/01-workflow-osm-tools.md +++ b/01-workflow-osm-tools.md @@ -255,6 +255,62 @@ 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 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 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 +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. + + 2. **Purpose** + + Purpose and benefits of the change (brief, one line is ok) + + 3. **References** + + Including references to the related bug or feature. + + 4. **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 (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. + + ## 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: