...
The 'master' branch is for the release currently in progress. There are alternate branches for past releases. (e.g. 'Casablanca').
Code
...
Submissions
Information on how to utilize Git and Gerrit to submit new code is available here: Configuring Gerrit.
...
When submitting to non-core POMBA repositories, it's helpful to label the submission with 'pomba', both for ease of filtering and batch reviewing.
JIRA Workflow (Submitted)
When all code submissions for a JIRA issue have been made, the JIRA issue should be transitioned from 'In Progress' to 'Submitted' to keep people informed.
Code Reviews
Code reviews are performed in Gerrit.
...
Note: For some projects (and maybe more in the future), comitters may not be from the same company as the submitter.
Project | Committers |
---|---|
POMBA | |
SDNC | |
AAI | |
OOM |
Note: Comitters are subject to change so make sure you're up to date!
...
Refer to Development Procedures and Policies#MagicWords for information about special "replies" that can be used to invoke actions.
Code Merges
Once code submissions have been made and a "+2" review has been received, authorized committers may then merge the change into a branch.
JIRA Workflow (Delivered)
Once all code submissions related to the JIRA issue have been merged into their respective project branches, the JIRA issue should be transitioned from 'Submitted' to 'Delivered' to inform others that, should they deploy ONAP, this feature, functionality or bug fix will be available.
Sonar Results
Once code is merged and a Sonar job is run, the results of the scan should be checked to ensure that proper line coverage has been met and there are no major vulnerabilities detected. If there is a lack of coverage or vulnerabilities reported, they should be addressed, preferably immediately, though a bug could be entered to prioritize and track this required work.
Refer to
Build Jobs
Verify Jobs
The verify jobs are engaged when code is submitted to the repository in order to confirm builds wouldn't break due to the inclusion of the change.
...