Skip to content

Development Process (Git Flow)

EMS code commit and release flow

Code Base

https://sqbu-github.cisco.com/Monitoring/event_management_system

Flow

img.png

Main brunch as main brunch, tag as release brunch, feature brunch as develop brunch.

For normal develop and release:
1.Create feature brunch from main brunch
2.Merge finished feature develop code from feature brunch to main brunch
3.Create tag for release package build

For hot fix:
4.If need hot fix, create hot fix brunch from tag
5.Merge hot fix back to tag and build pkg for release
6.Merge hot fix to related feature brunch
7.Merge the hot fix to Main from feature brunch

For developing big feature cross release:
8.Update feature brunch before merge to main

Package build

Jenkins: https://engci-jenkins-gpk.cisco.com/jenkins/job/team_mas/view/EMS/job/Event-Management-System/

Suggest Build release package from tag brunch, test package from feature brunch.