github - Git branching strategies for CICD -


just looking thought on below branching strategies keeping cicd in mind.

  1. master branch -

    1.1 development branch - fork master

              team branch - fork development branch , merge                            development branch after feature implementation                            qa/integration testing            team b branch - same above     1.1.1 release branch - goes in prod

once team , team b branch merge , qa verification done, create release branch , have final regression on it. release branch go production.

then merge release master branch.

intent -

  1. master branch stable , production running code available in it.

  2. team branch can deployed on dev environment , have required cicd configuration on server.

any issue approach?

to being doing ci (and ci required cd) merge master regularly , not have long lived feature branches. believe once day expected "ci".

an alternative approach 1 suggest have short lived developer branches daily work. have deployment pipeline moves each code change through series of test stages. once changes have passed each stage go next stage , ready production. allows work on master remain stable , allow passing code enter production.

to deal independent feature work can use feature toggles instead of branches. can toggle features on , push master test them , deploy if well. if not, or if there business need remove feature, can toggle off feature , continue use master safely. have seen work on 2 products have worked on.

i know simplified make suggestion of alternatives , help. can learn more implementing these techniques on bunch of blogs , stackoverflow answers - http://martinfowler.com/articles/feature-toggles - http://www.paulhammond.org/2010/06/trunk/alwaysshiptrunk.pdf - feature toggles vs feature branches


Comments

Post a Comment

Popular posts from this blog

php - Wordpress website dashboard page or post editor content is not showing but front end data is showing properly -

Image
recently have uploaded wordpress site onto server. have uploaded wordpress site in sub-folder under root folder ../root(domain root folder)/wordpress (where host wordpress folder). now problem content data in page or post in dashboard of wordpress admin panel not showing - see image. but data showing in front view - see image. if not browser cache issue , not issue happened tinymce editor during upgrade; try add config file: define('concatenate_scripts', false);
Read more

How to get the ip address of VM and use it to configure SSH connection dynamically in Ansible -

i trying ip address of vm , trying use establish ssh vm. following script: --- - hosts: localhost become: yes connection: local gather_facts: false serial: 1 vars_files: - createvmvars.yml tasks: - name: gathering vm info. vsphere_guest: vcenter_hostname: "{{vcenter_hostname}}" username: "{{vcenter_username}}" password: "{{vcenter_password}}" guest: "{{guest_name}}" vmware_guest_facts: yes register: var - debug: msg="{{var.ansible_facts.hw_eth0.ipaddresses[0]}}" - name: establishing ssh connection. script: /home/shasha/devops/scripts/ssh_configure.sh "{{var.ansible_facts.hw_eth0.ipaddresses[0]}}" following content of ssh_configure.sh : #!/bin/sh ssh-keygen -t rsa ssh-copy-id $1 but when running playbook, getting following error while executing third task: error! 'var' undefined but debug module(second task) printin
Read more

javascript - Get parameter of GET request -

i make request: createxhrrequest( "get", fileurl, function( err, response ) { if( err ) { alert( "error get!" ); } alert(response); }); and full response: { "status" : "ok", "message" : "jvberi0xljqkjdduxdgkmy how can jvberi0xlj ? i try response.message , response["message"]. nothing works. just simple access this: var json = json.parse(response); json.message
Read more