Jenkins & Gitreconcil continuous integration & feature-branches<br />Mai 28th , 2011<br />Jenkins User Meetup @Paris<br />...
©2011 CloudBees, Inc. All Rights Reserved<br />Nicolas De loof<br /><ul><li>Java-Boy
New-Bee at
CommitterMaven(GWT)
JUG-Leader</li></li></ul><li>Let’s talk about Henry (real nameobfuscated)<br />©2011 CloudBees, Inc. All Rights Reserved<b...
Working on top of a Scrum of Scrums<br />EachScrum-team has a reduced scope and dedicatedbranch for betterefficiency<br />...
EachScrum-team follows agile development practices and uses c.i.<br />But … <br />Continuousintegration<br />©2011 CloudBe...
(http://martinfowler.com/bliki/FeatureBranch.html)<br />(isolated) Featurebranch<br />©2011 CloudBees, Inc. All Rights Res...
Poor-man continuousintegration<br />Requiresmerging Herecomes Henry<br />« PromiscuousIntegration »<br />©2011 CloudBees,...
« membersof a team integratetheirworkfrequently. Eachintegrationisverified by an automatedbuildto detectintegrationerrorsa...
« Mege-manager »<br />©2011 CloudBees, Inc. All Rights Reserved<br /><ul><li>Merge branches at sprint-end
Build, Test
Commit intotrunk</li></ul>(on fridayevening)<br />
alsoconsiderourproject-workflow<br />©2011 CloudBees, Inc. All Rights Reserved<br />http://nvie.com/posts/a-successful-git...
Henry needs help … Volunteers ?<br />©2011 CloudBees, Inc. All Rights Reserved<br />
Mergeisdifficult : do itfrequently<br />Mergeismanual : automate<br />Mergecomestoolate : do it ASAP<br />Apply Agile prin...
C.I. & feature-branches – simple (naive)<br />©2011 CloudBees, Inc. All Rights Reserved<br />
C.I. & feature-branches – team-focussed<br />©2011 CloudBees, Inc. All Rights Reserved<br />
C.I. & feature-branches – betterway<br />©2011 CloudBees, Inc. All Rights Reserved<br />
Upcoming SlideShare
Loading in...5
×

Jenkins user meetup @paris

1,529

Published on

How to reconcil continuous integration & git branches

Published in: Education
0 Comments
3 Likes
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total Views
1,529
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
0
Comments
0
Likes
3
Embeds 0
No embeds

No notes for slide

Jenkins user meetup @paris

  1. 1. Jenkins & Gitreconcil continuous integration & feature-branches<br />Mai 28th , 2011<br />Jenkins User Meetup @Paris<br />©2011 Cloud Bees, Inc. All Rights Reserved<br />
  2. 2. ©2011 CloudBees, Inc. All Rights Reserved<br />Nicolas De loof<br /><ul><li>Java-Boy
  3. 3. New-Bee at
  4. 4. CommitterMaven(GWT)
  5. 5. JUG-Leader</li></li></ul><li>Let’s talk about Henry (real nameobfuscated)<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  6. 6. Working on top of a Scrum of Scrums<br />EachScrum-team has a reduced scope and dedicatedbranch for betterefficiency<br />Henry is « merge manager »<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  7. 7. EachScrum-team follows agile development practices and uses c.i.<br />But … <br />Continuousintegration<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  8. 8. (http://martinfowler.com/bliki/FeatureBranch.html)<br />(isolated) Featurebranch<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  9. 9. Poor-man continuousintegration<br />Requiresmerging Herecomes Henry<br />« PromiscuousIntegration »<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  10. 10. « membersof a team integratetheirworkfrequently. Eachintegrationisverified by an automatedbuildto detectintegrationerrorsas quickly as possible. <br />(…) significantlyreducedintegrationproblems and allows a team to developcohesive software more rapidly. »<br />http://martinfowler.com/articles/continuousIntegration.html<br />ContinuousIntegration<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  11. 11. « Mege-manager »<br />©2011 CloudBees, Inc. All Rights Reserved<br /><ul><li>Merge branches at sprint-end
  12. 12. Build, Test
  13. 13. Commit intotrunk</li></ul>(on fridayevening)<br />
  14. 14. alsoconsiderourproject-workflow<br />©2011 CloudBees, Inc. All Rights Reserved<br />http://nvie.com/posts/a-successful-git-branching-model/<br />
  15. 15. Henry needs help … Volunteers ?<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  16. 16. Mergeisdifficult : do itfrequently<br />Mergeismanual : automate<br />Mergecomestoolate : do it ASAP<br />Apply Agile principles<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  17. 17. C.I. & feature-branches – simple (naive)<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  18. 18. C.I. & feature-branches – team-focussed<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  19. 19. C.I. & feature-branches – betterway<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  20. 20. « ReuseRecordedResolution »<br />Git ReReRe<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  21. 21. C.I. & feature-branches – evenbetter<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  22. 22. Now, Henry has more spare time for (really) important things<br />©2011 CloudBees, Inc. All Rights Reserved<br />
  23. 23. ©2011 CloudBees, Inc. All Rights Reserved<br />

×