Sunday, February 15, 2015

Branching for test,staging and production

This document in intended for source version controlling for Test Env,Stag Env and Prodcution Env

List of things that need to be done
Creating Production Branch
Creating Stag  Branch
Creating development branch
Creating a tags (Not Described)
Creating a separate developer branch(Not Described)

Acess Policies in Branches

How to merge in branches

How activities  goes .

Developer
Developer will be using master branch only.They are unaware of stag branch and production branch.They will not be using any other operation other than pull,commit and push.This master branch has mapping with test env on GCE.Everything that is done on master branch is fresh cloned  on test env and tested thoroughly

Tester:After tester has passed the test then system admin is notified to merge master branch to staging.He will be only doing following operations in his local system.
Merging stage branch with origin/master
Step1:First of all clone stage branch .

Step2:Do not directly merge .Make a pull.You will get origin/master branch.

Step3:Now make a Merge .Select origin/master in Remote tracking .Do not select othere branch other than origin/master .Use default system selected merge options and fast forward options
Step4:Push Branch.

Staging branch has mapping with staging env in GCE.Now clone the staging branch in GCE in staging env .

If there is no any bug and error on staging then again it is merged with production branching .The steps are similar for merging stage with production branching .

Merging prodcution branch with origin/stage

Step1:First of all clone prodcution branch .

Step2:Do not directly merge .Make a Pull.You will get origin/stage branch.

Step3:Now make a merge .Select origin/stage in Remote tracking .Do not select othere branch other than origin/stage .Use default system selected merge options and fast forward options.
Step4:Push Branch.

No comments:

Post a Comment