Jenkins user meetup @paris

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)

Working on top of a Scrum of Scrums
EachScrum-team has a reduced scope and dedicatedbranch for betterefficiency
Henry is « merge manager »

EachScrum-team follows agile development practices and uses c.i.
But …
Continuousintegration

(http://martinfowler.com/bliki/FeatureBranch.html)
(isolated) Featurebranch

Poor-man continuousintegration
Requiresmerging Herecomes Henry
« PromiscuousIntegration »

« 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

« Mege-manager »
Merge branches at sprint-end
Build, Test
Commit intotrunk
(on fridayevening)

alsoconsiderourproject-workflow
http://nvie.com/posts/a-successful-git-branching-model/

Henry needs help … Volunteers ?

Mergeisdifficult : do itfrequently
Mergeismanual : automate
Mergecomestoolate : do it ASAP
Apply Agile principles

C.I. & feature-branches – simple (naive)

C.I. & feature-branches – team-focussed

C.I. & feature-branches – betterway

« ReuseRecordedResolution »
Git ReReRe

C.I. & feature-branches – evenbetter

Now, Henry has more spare time for (really) important things

Jenkins user meetup @paris

by Nicolas De loof on May 27, 2011

Accessibility

Categories

Tags

Upload Details

Usage Rights

1 Embed 2

Statistics

Jenkins user meetup @paris — Presentation Transcript