• Share
  • Email
  • Embed
  • Like
  • Save
  • Private Content
Jenkins user meetup @paris
 

Jenkins user meetup @paris

on

  • 1,599 views

How to reconcil continuous integration & git branches

How to reconcil continuous integration & git branches

Statistics

Views

Total Views
1,599
Views on SlideShare
1,597
Embed Views
2

Actions

Likes
3
Downloads
0
Comments
0

1 Embed 2

http://twitter.com 2

Accessibility

Categories

Upload Details

Uploaded via as Microsoft PowerPoint

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

    Jenkins user meetup @paris Jenkins user meetup @paris Presentation Transcript

    • Jenkins & Gitreconcil continuous integration & feature-branches
      Mai 28th , 2011
      Jenkins User Meetup @Paris
      ©2011 Cloud Bees, Inc. All Rights Reserved
    • ©2011 CloudBees, Inc. All Rights Reserved
      Nicolas De loof
      • Java-Boy
      • New-Bee at
      • CommitterMaven(GWT)
      • JUG-Leader
    • Let’s talk about Henry (real nameobfuscated)
      ©2011 CloudBees, Inc. All Rights Reserved
    • 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
    • EachScrum-team follows agile development practices and uses c.i.
      But …
      Continuousintegration
      ©2011 CloudBees, Inc. All Rights Reserved
    • (http://martinfowler.com/bliki/FeatureBranch.html)
      (isolated) Featurebranch
      ©2011 CloudBees, Inc. All Rights Reserved
    • Poor-man continuousintegration
      Requiresmerging Herecomes Henry
      « PromiscuousIntegration »
      ©2011 CloudBees, Inc. All Rights Reserved
    • « 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
    • « Mege-manager »
      ©2011 CloudBees, Inc. All Rights Reserved
      • Merge branches at sprint-end
      • Build, Test
      • Commit intotrunk
      (on fridayevening)
    • alsoconsiderourproject-workflow
      ©2011 CloudBees, Inc. All Rights Reserved
      http://nvie.com/posts/a-successful-git-branching-model/
    • Henry needs help … Volunteers ?
      ©2011 CloudBees, Inc. All Rights Reserved
    • Mergeisdifficult : do itfrequently
      Mergeismanual : automate
      Mergecomestoolate : do it ASAP
      Apply Agile principles
      ©2011 CloudBees, Inc. All Rights Reserved
    • C.I. & feature-branches – simple (naive)
      ©2011 CloudBees, Inc. All Rights Reserved
    • C.I. & feature-branches – team-focussed
      ©2011 CloudBees, Inc. All Rights Reserved
    • C.I. & feature-branches – betterway
      ©2011 CloudBees, Inc. All Rights Reserved
    • « ReuseRecordedResolution »
      Git ReReRe
      ©2011 CloudBees, Inc. All Rights Reserved
    • C.I. & feature-branches – evenbetter
      ©2011 CloudBees, Inc. All Rights Reserved
    • Now, Henry has more spare time for (really) important things
      ©2011 CloudBees, Inc. All Rights Reserved
    • ©2011 CloudBees, Inc. All Rights Reserved