• Save
Jenkins user meetup @paris
Upcoming SlideShare
Loading in...5
×

Like this? Share it with your network

Share

Jenkins user meetup @paris

  • 1,818 views
Uploaded on

How to reconcil continuous integration & git branches

How to reconcil continuous integration & git branches

More in: Education
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Be the first to comment
No Downloads

Views

Total Views
1,818
On Slideshare
1,816
From Embeds
2
Number of Embeds
1

Actions

Shares
Downloads
0
Comments
0
Likes
3

Embeds 2

http://twitter.com 2

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
    No notes for slide

Transcript

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