Skip to content

Instantly share code, notes, and snippets.

@ZheyangSong

ZheyangSong/Juniper_OpenContrail_Code_Review_Merge_Process.md

Last active January 29, 2019 23:54
Show Gist options
  • Save ZheyangSong/15680d6a6138cf5fa0266eb520fcd90c to your computer and use it in GitHub Desktop.
Save ZheyangSong/15680d6a6138cf5fa0266eb520fcd90c to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Juniper_OpenContrail_Code_Review_Merge_Process.md

Merge Code to Mainline (repos under Juniper org)

  • Ask the manager about gaining permissions to raise code review and to push code to mainline repos

  • If upstream to corresponding mainline repo doesn't exist, add it to your local repo(s) that contain(s) changes you need to merge.

  • Log in https://bugs.launchpad.net/juniperopenstack/, then create a new bug report (Instruction to creating a new bug is described here), if your code change is for a new feature, or find an existing bug otherwise.

  • Back to your terminal, commit your code changes locally, if you haven't done it.

    • For a successful CI, the commit message needs to meet the requirements (for old launchpad bugs) described here and here, or the requirements (for new JIRA tickets) described here

    • As of the bug number, it can be found from an existing bug or a newly created one on https://bugs.launchpad.net/juniperopenstack:

      position of a bug number

  • Make sure that git-review is installed globally already. (Instruction to setting up git-review can be found here).

  • For raising a code review, make sure that the gerrit remote source is set up in your repo(s). (Instruction to adding gerrit remote source is located here)

  • Once your code change is committed with proper message, gerrit is set and git-reivew is installed, run below command at the root of your local repo containing changes to be pushed:

    $ git review

  • After run the command, log into https://review.opencontrail.org, you should see your new review request listed. Open the new review request, add proper person to the list of reviewers. Then copy the review request url from the browser's address bar and send it, as notification to the proper channel/media/personal: add reviewers

  • Once the code review gets passed, your code will be merged into mainline/master automatically

Create a New Bug

  • To create a new Bug, log into https://bugs.launchpad.net/juniperopenstack/ and click on Report a bug as shown below: location of report a bug button

  • Create one line summary for your bug: one line summary for a new bug

  • If no found result is related to your code change, click on No, I need to report a new bug at the bottom of the result list: report a new bug

  • Add some details to Further Information: add further description

  • Fill necessary info under Extra Options: fill extra options

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment