Versioning schemes, branching models

Support your Continuous Delivery processContinuous Delivery meetup, 18-05-2016

Triple, AlkmaarPavel Chunyayev

@PavelChunyayev

Amsterdam

Levi9 HQAmsterdam – 2005

25 people

Novi Sad

SerbiaNovi Sad – 2005

320+ people

Zrenjanin

SerbiaZrenjanin– 2014

30+ people

Iasi

RomaniaIasi – 200780+ people

Kiev

UkraineKiev – 2008130+ people

@PavelChunyayev

Electronic Retail

DigitalMarketing

Traffic and Transport

Software Services

@PavelChunyayev

Customer satisfaction 2015

• 4th year great results in Outsourcing Performance study

• 2015: 100% customer recommendation scoreExcellent trust score

@PavelChunyayev

About me

• 12 years of IT experience• Lived and worked in Ukraine and Estonia • Moved a year and half ago to the Netherlands

• Love cycling• Learn Dutch

• Alpe d’HuZes - http://deelnemers.opgevenisgeenoptie.nl/levi9

@PavelChunyayev

Continuous Delivery

@PavelChunyayev

Continuous Delivery

Incept

• Business idea• Is needed

immediately• Should be validated

Plan

• Refine• Estimate• Prioritize

Develop

• Put into sprint• Develop in a branch• Conduct a code

review• Merge into master

Build

• Trigger pipeline• Build• Unit testing• Integration testing• Static code analysis

Test

• Contract testing• E2E testing• Security testing• Resilience testing

Release

• Zero-downtime• Canary testing• Rolling deployment• Blue / green

deployment

Operate

• Monitoring• Validation of the

idea• Money generation• Disposal

@PavelChunyayev

Quality > Speed

@PavelChunyayev

Keep the product releasableBuild quality in

@PavelChunyayev

Build • Test • Release

@PavelChunyayev

Continuous Delivery

Incept

• Business idea• Is needed

immediately• Should be validated

Plan

• Refine• Estimate• Prioritize

Develop

• Put into sprint• Develop in a branch• Conduct a code

review• Merge into master

Build

• Trigger pipeline• Build• Unit testing• Integration testing• Static code analysis

Test

• Contract testing• E2E testing• Security testing• Resilience testing

Release

• Zero-downtime• Canary testing• Rolling deployment• Blue / green

deployment

Operate

• Monitoring• Validation of the

idea• Money generation• Disposal

@PavelChunyayev

@PavelChunyayev

@PavelChunyayev

@PavelChunyayev

@PavelChunyayev

@PavelChunyayev

Versioning

@PavelChunyayev

Versioning models• Versioning SaaS vs installed applications• Releases, bugfixes and hotfixes

• Numeric• Date based• Semantic versioning• Marketing versions

@PavelChunyayev

Numeric• Major.Minor• Major.Minor.Patch• Major.Minor.Patch.Build• Major.Minor.Build• Major.Minor.Build.Revision• Major.Minor.Date

• 4.11, 5.2• 5.2.1, 9.3.2• 1.6.8.529• 1.6.529• 1.6.529.e91ba3• 1.6.150518

@PavelChunyayev

Major.Minor• -SNAPSHOT, -M1, -RC1, -RELEASE (.RELEASE) • 1.0-SNAPSHOT• 5.6-RC1• 2.5.0-M2• 5.2.1.RELEASE

@PavelChunyayev

How to change version?• Software never reaching 1.0• Rapidly increasing version

@PavelChunyayev

Date based• Major.Minor.Date or just Date• 2.5.201505181• 0.2.2015051801• 1.7.20150518001• 1.0.201505181936• 3.1.20150518193956• 20150518194513• 2015.05.18-19.46.15

@PavelChunyayev

Semantic versioning• Major.minor.patch-prerelease+metadata• 0.1.4-b45+d2e760• 0.1.5-46• 0.2.0-150518• 0.2.1-prerelease+b538• 1.0.0-alpha• 1.3.9-beta• 2.0.0

@PavelChunyayev

Semantic versioning• Semver and continuous delivery• Assigning a version before release or after?• Enforcing the sequence of pull requests?• Not really needed for SaaS

• Build number is an abuse of semantic versioning

• Backwards compartible change or not?• Integrated application• Collection of applications

@PavelChunyayev

Marketing version• Whatever product management or marketing decide to call it• 2016 Early• 2016.5• Ultra, Turbo, Extra, VIP, Premium, Free

• How often to release and how often to increase the version number?

@PavelChunyayev

How to generate and save version number• In the source code• External• Date• Build number• Source control

• Bump up the version• Before new feature or after new feature• Manually vs script while commiting (hooks)

@PavelChunyayev

What to version?• Your product• Separate applications• Libraries, building blocks and tools • Public and private (internal versioning)

• Public (and private) API• DB schemas• Infrastructure configuration

@PavelChunyayev

Versioning things• Embedded (meta information) vs filename• Package the code and assign version to the packages• Dependency management• Latest• Ranges• Explicitly specified

@PavelChunyayev

Version of the product in microservices world?

@PavelChunyayev

Updating the contract

@PavelChunyayev

Updating the contract

@PavelChunyayev

Updating the contract

@PavelChunyayev

Updating the contract

@PavelChunyayev

Updating the contract

@PavelChunyayev

Branching

@PavelChunyayev

Models• SaaS vs installed

• Trunk-based• Feature driven • Release branches• Git flow• Open-source

@PavelChunyayev

Trunk based

@PavelChunyayev

Feature branching

@PavelChunyayev

Release branches

@PavelChunyayev

Gitflow

@PavelChunyayev

Open source model

@PavelChunyayev

Branching things• Tagging• Fork vs branching• Pull requests (merge requests)• Run tests• Code review

@PavelChunyayev

Continuous Delivery

Incept

• Business idea• Is needed

immediately• Should be validated

Plan

• Refine• Estimate• Prioritize

Develop

• Put into sprint• Develop in a branch• Conduct a code

review• Merge into master

Build

• Trigger pipeline• Build• Unit testing• Integration testing• Static code analysis

Test

• Contract testing• E2E testing• Security testing• Resilience testing

Release

• Zero-downtime• Canary testing• Rolling deployment• Blue / green

deployment

Operate

• Monitoring• Validation of the

idea• Money generation• Disposal

Keep the product releasableBuild quality in

Version everythingBranch out when needed

@PavelChunyayev

Key takeaways• Focus on quality, speed will come• Quality has to be integral part of the process• Version each artifact uniquely • Select the branching model that supports

your product• Integrate frequently

Any questions?

pavel@levi9.com