...
- For features - open a RDKDEV (for video or generic contributions) or RDKBDEV (for Broadband contributions)
- Clone the component code from rdk-next branch
- Apply changes
- Push the patch to Gerrit for review
- Trigger reviews and handle review comments
- Change set trigger: Use TDK for validation and BlackDuck scan for license compliance
Step
...
1 : Developer to create RDKDEV/RDKBDEV tickets
- Log in to JIRA https://jira.rdkcentral.com/jira/secure/Dashboard.jspa using rdkcentral credentials
- Click on the Create button
![](/download/attachments/90117033/image2020-1-23_17-20-34.png?version=1&modificationDate=1579780235000&api=v2)
Step
...
2 : Developer clones component
Developer clones component repository from Gerrit server https://code.rdkcentral.com/r/ into local work space
Step
...
3 : Developer works on the change
• The Developer creates a topic branch in the local work area, makes the necessary changes and then squashes the commits prior to pushing for review.
Panel |
---|
git checkout -b <Branch Name> |
Step 4 : Gerrit for review
Developer pushes the new change to Gerrit for review, i.e. to refs/for/master
...
• When interfacing with Gerrit you push to a virtual branch, /refs/for/<branch>, representing "code review before submission to branch".
• Gerrit will subsequently assign a unique URL for the change, to facilitate access and review via the web UI.
Step 5,6,7 :
Review notifications and addition of new reviewers.
...
Reviewers can comment on and score a given change.
• The default set of rules for enabling a code change for submission requires a Code Review score of +2 and a +1 score on any mandatory Gerrit labels configured for the project.
• The result of the scoring process and validation rules is to enable the Submit action on the Gerrit Web UI and subsequent merge capability to the target branch.
+2 Value approval
‐2 Do not submit.
+1 Enables a submit
‐1 Block a submit
Step
...
8 : JIRA ticket status update
- After Component Verification Update the JIRA ticket status in https://jira.rdkcentral.com/
![](/download/attachments/90117033/Screenshot%20%2845%29.png?version=2&modificationDate=1580119445000&api=v2)
Step
...
Submit change
- Only authorized users i.e. component owners and component approvers can submit the change allowing Gerrit to merge it to the target branch as soon as possible.
- A change can be submitted, having satisfied the approval conditions described earlier, by clicking the 'Submit Patch Set n' button within the Gerrit UI.
Abandon change.
- A conscious decision is made to abandon the change based on the review outcome.
- The component owner or an authorized user may abandon the change by clicking the "Abandon Change" button.
- The abandoned changes are not removed from the Git repository and could be restored at a later stage.
...
- The change depends on another change that is still in review.
- In this case the change will be merged automatically once all its dependencies are submitted and merged
...
9 : Change needs to be reworked
Panel |
---|
git fetch https://user@code.rdkcentral.com/r/component1 refs/changes/02/2/1 && git checkout FETCH_HEAD |
...
After this change a new patch set is created for the change.
Step 11 : CMF build & test
Submit change
Submit change
- Only authorized users i.e. component owners and component approvers can submit the change allowing Gerrit to merge it to the target branch as soon as possible.
- A change can be submitted, having satisfied the approval conditions described earlier, by clicking the 'Submit Patch Set n' button within the Gerrit UI.
Abandon change.
- A conscious decision is made to abandon the change based on the review outcome.
- The component owner or an authorized user may abandon the change by clicking the "Abandon Change" button.
- The abandoned changes are not removed from the Git repository and could be restored at a later stage.
Submitted, Merge Pending
- The change depends on another change that is still in review.
- In this case the change will be merged automatically once all its dependencies are submitted and merged