doc: changes to merge criteria (4 eyes principle) #62122
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
erwango
reviewed
Aug 31, 2023
erwango
reviewed
Aug 31, 2023
erwango
reviewed
Aug 31, 2023
erwango
reviewed
Aug 31, 2023
doc/project/project_roles.rst
Outdated
Comment on lines
330
to
333
| * Release engineers shall not merge code changes originating from the same | ||
| organisation if all other reviewers are also from the same organisation. | ||
| To be able to merge such changes, at least one review shall be from a | ||
| different organisation. |
There was a problem hiding this comment.
What about ?
A change coming from one organisation needs at least an approval from another organisation to be merged
aescolar
requested changes
Sep 4, 2023
carlescufi
previously requested changes
Sep 4, 2023
doc/project/project_roles.rst
Outdated
| submitters' organisation). | ||
| * Changes or additions to hardware support (driver, SoC, boards) shall at | ||
| least have the merger be from a different organisation. | ||
| * Release engineers shall not merge code changes originating from the same |
There was a problem hiding this comment.
This should not apply for certain types of changes in my opinion. There are just too many changes that are very difficult to review for someone who is not familiar with the hardware or area. I would again differentiate between introducing new things and maintaining them.
aescolar
previously requested changes
Sep 4, 2023
aescolar
reviewed
Sep 4, 2023
erwango
reviewed
Sep 8, 2023
kartben
reviewed
Sep 20, 2023
Reference to slide that does not exist. Signed-off-by: Anas Nashif <[email protected]>
Document 4 eye principal for reviews and merges. Signed-off-by: Anas Nashif <[email protected]>
henrikbrixandersen
approved these changes
Sep 26, 2023
simhein
approved these changes
Sep 26, 2023
marc-hb
reviewed
Sep 27, 2023
| each affected area; Unless the changes to a given area are considered trivial | ||
| enough, in which case approvals by other affected subsystems | ||
| maintainers/collaborators would suffice. | ||
| * Four eye principle on the organisation level. We already require at least 2 |
There was a problem hiding this comment.
Suggested change
| * Four eye principle on the organisation level. We already require at least 2 | |
| * Four eyes principle on the organisation level. We already require at least 2 | |
| approvals (basic four eyeS principle), however, such reviews and approvals |
| one review shall be from a different organisation. | ||
|
|
||
| * A minimum review period of 2 business days, 4 hours for trivial changes (see | ||
| :ref:`review_time`). |
There was a problem hiding this comment.
I find these very short but off-topic...
kartben
approved these changes
Sep 27, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #61358