Versions Compared

Old Version 12

changes.mady.by.user Ashraf Bhanu Kothapeta

Saved on

compared with

New Version 13

changes.mady.by.user Lakshmipriya P

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Gliffy Diagram
macroIdbade9e7a-5c71-40d0-bc66-8e7dc2cd2b5f
nameTicketFlow
pagePin2

  • 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

...

  • The Developer may request feedback by adding additional reviewers via the Gerrit web GUI or command line.
  • Component owners/reviewers/approvers, defined as specific groups in the external LDAP system, will be added by default

Post Checkin process

 Uses TDK for component validation 

Run BlackDuck, copyright scanning and build on code submission.

...

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

...

Image Removed

...

,9,10 : About Changeset

Changeset needs to be reworked

Panel
git fetch https://user@code.rdkcentral.com/r/component1 refs/changes/02/2/1 && git checkout FETCH_HEAD

...

A new patch set is now appended to the Gerrit review item, and  this will go through the same review process as before.

...

Gerrit conflict resolution

Panel

git checkout -b topic_branch
git fetch https://user@code.rdkcentral.com/r/rdk_component_1 refs/changes/58/58/2 && git checkout FETCH_HEAD
git rebase origin/master

[Edit the conflicting file, cleaning up the <<<<, ==== >>> markers surrounding the conflicting lines]


git add <file>
git commit --amend
git push origin HEAD:refs/for/master

...

After this change a new patch set is created for the change.

Step 11 : JIRA ticket status update

Image Added

Step 12 : CMF build & test

Submit change

Submit change

...

  • 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

Once the changes got merged in CMF, ticket will gets automatically updated with those information.