SlideShare ist ein Scribd-Unternehmen logo
1 von 23
1 Copyright ©2014 CollabNet, Inc. All Rights Reserved.ENTERPRISE CLOUD DEVELOPMENT
TeamForge integration with Git/Gerrit
Diffy gets Enterprise gradeDiffy gets Enterprise grade
TeamForge Gerrit IntegrationTeamForge Gerrit Integration
Eryk SzymanskiEryk Szymanski
Dariusz LukszaDariusz Luksza
CollabNet Engineering, Potsdam, GermanyCollabNet Engineering, Potsdam, Germany
2 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
TeamForgeTeamForge
3 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
…… and the Enterpriseand the Enterprise
4 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
Enterprise GradeEnterprise Grade
Integration of existing 
tools
Security, standards and audit 
compliance
Scalability (and manageability at 
scale)
5 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
Enterprise GradeEnterprise Grade
SearchabilitySearchability – across TF artifacts, including Code Search across multiple– across TF artifacts, including Code Search across multiple
repositories, gerrit instances and other SCM tools.repositories, gerrit instances and other SCM tools.
Traceability –Traceability – associating the source code with
requirements, issues, documents, tasks and other
artifacts.
RBAC –RBAC – Role Based Access Control – permissions to perform certain
operations are assigned to roles. Management of individual permissions
becomes a matter of simply assigning appropriate roles to the given
users.
6 Copyright ©2014 CollabNet, Inc. All Rights Reserved.ENTERPRISE CLOUD DEVELOPMENT
TeamForge integration with Git/Gerrit
Introducing Gerrit IntegrationIntroducing Gerrit Integration
7 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
TeamForge Gerrit IntegrationTeamForge Gerrit Integration
Our mission:Our mission:
Make Gerrit first-class citizen of TeamForge ecosystemMake Gerrit first-class citizen of TeamForge ecosystem
➔
Multiple Gerrit instances can be controlled by TeamForge.
➔
Make use of TeamForge features:
➔
Enable Source Code Search and Commit Objects.
➔
Use TeamForge RBAC for Access Rights.
➔
Make sure it is secure and audit compliant.
➔
Enable TeamForge-like look and feel (branding).
➔
But keep in mind that Gerrit is also a Git Server.
8 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
TeamForge Git/Gerrit IntegrationTeamForge Git/Gerrit Integration
➔
Managed by TeamForge
➔
Based on modified Gerrit 2.7 (about 70 patches)
➔
Plugins: sync, secure store, history protection, notification
➔
Custom branding
9 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
TeamForge Git/Gerrit IntegrationTeamForge Git/Gerrit Integration
10 Copyright ©2014 CollabNet, Inc. All Rights Reserved.ENTERPRISE CLOUD DEVELOPMENT
TeamForge integration with Git/Gerrit
➢RepoCategory
➢History Protection
➢Notifications
Features:
11 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
TF SCM permissionsTF SCM permissions
12 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
Gerrit Access RightsGerrit Access Rights
13 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
RepoCategory (aka Code Review Policy)RepoCategory (aka Code Review Policy)
ImplementationImplementation::
●
MapMap TeamForge SCM permissions toTeamForge SCM permissions to Gerrit Access Rights.Gerrit Access Rights.
●
Provide pre-definedProvide pre-defined code review policiescode review policies so anyone can start toso anyone can start to
work with Gerrit within a few steps.work with Gerrit within a few steps.
●
Code review policiesCode review policies are applied per repository.are applied per repository.
Motivation:Motivation:
Shield most users from Gerrit’s complexities by using pre-definedShield most users from Gerrit’s complexities by using pre-defined
repo categories and generic TeamForge RBAC model with its SCMrepo categories and generic TeamForge RBAC model with its SCM
permissions.permissions.
Without hiding advanced features for power users.Without hiding advanced features for power users.
14 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
RepoCategoryRepoCategory
15 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
RepoCategoryRepoCategory
●
DefaultDefault: All Gerrit review features are turned off
●
Mandatory ReviewMandatory Review: All code changes have to be reviewed
●
Optional ReviewOptional Review: Review feature is turned on but can be bypassed if necessary
●
CustomCustom: Access rights have to be set manually in Gerrit Web UI and will not be
overridden by TeamForge
●
User-definedUser-defined: Possibility to define your own access rights controlled by TeamForge
Pre defined & user-defined categoriesPre defined & user-defined categories
16 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
History RewriteHistory Rewrite
17 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
History ProtectionHistory Protection
●
DetectsDetects force pushforce push andand branch deletionbranch deletion operationsoperations
●
Creates aCreates a special referencespecial reference pointing to thepointing to the current statecurrent state
●
ThisThis referencereference contains all necessary information such as:contains all necessary information such as:
who made the change,who made the change,
when was it done,when was it done,
what was the branch/ref namewhat was the branch/ref name
what are the old and new commit idswhat are the old and new commit ids
●
Provides the possibility toProvides the possibility to ressurectressurect
●
AA notification emailnotification email is sent automatically to members of theis sent automatically to members of the GerritGerrit ‘Administrators’‘Administrators’
groupgroup, and new entry in the, and new entry in the audit logaudit log is createdis created
●
Can be appliedCan be applied globallyglobally for the wholefor the whole Gerrit ServerGerrit Server oror
locallylocally for a givenfor a given repositoryrepository
18 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
HistoryHistory Protection - The ‘Un-do’ ButtonProtection - The ‘Un-do’ Button
19 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
History Protection - Audit ComplianceHistory Protection - Audit Compliance
20 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
NotificationsNotifications
Motivation:Motivation:
Bring the git push notifications mechanism from the gitmultimailBring the git push notifications mechanism from the gitmultimail
script to TeamForgescript to TeamForge
21 Copyright ©2014 CollabNet, Inc. All Rights Reserved.
NotificationsNotifications
22 Copyright ©2014 CollabNet, Inc. All Rights Reserved.ENTERPRISE CLOUD DEVELOPMENT
TeamForge integration with Git/Gerrit
Live DemoLive Demo
23 Copyright ©2014 CollabNet, Inc. All Rights Reserved.ENTERPRISE CLOUD DEVELOPMENT
TeamForge integration with Git/Gerrit
Thank you very much.Thank you very much.
Questions?Questions?

Weitere ähnliche Inhalte

Was ist angesagt?

What's New for GitLab CI/CD February 2020
What's New for GitLab CI/CD February 2020What's New for GitLab CI/CD February 2020
What's New for GitLab CI/CD February 2020Noa Harel
 
GitLab: One Tool for Software Development (2018-02-06 @ SEIUM, Braga, Portugal)
GitLab: One Tool for Software Development (2018-02-06 @ SEIUM, Braga, Portugal)GitLab: One Tool for Software Development (2018-02-06 @ SEIUM, Braga, Portugal)
GitLab: One Tool for Software Development (2018-02-06 @ SEIUM, Braga, Portugal)Pedro Moreira da Silva
 
What's New in GitLab and Software Development Trends
What's New in GitLab and Software Development TrendsWhat's New in GitLab and Software Development Trends
What's New in GitLab and Software Development TrendsNoa Harel
 
Gerrit Code Review Analytics
Gerrit Code Review AnalyticsGerrit Code Review Analytics
Gerrit Code Review AnalyticsLuca Milanesio
 
GerritHub.io - present, past, future
GerritHub.io - present, past, futureGerritHub.io - present, past, future
GerritHub.io - present, past, futureLuca Milanesio
 
Flex and .NET Integration
Flex and .NET IntegrationFlex and .NET Integration
Flex and .NET Integrationicaraion
 
Introducing GitLab (September 2018)
Introducing GitLab (September 2018)Introducing GitLab (September 2018)
Introducing GitLab (September 2018)Noa Harel
 
GitLab webcast - Release 8.4
GitLab webcast - Release 8.4GitLab webcast - Release 8.4
GitLab webcast - Release 8.4GitLab, Inc
 
Speed up Continuous Delivery with BigData Analytics
Speed up Continuous Delivery with BigData AnalyticsSpeed up Continuous Delivery with BigData Analytics
Speed up Continuous Delivery with BigData AnalyticsLuca Milanesio
 
Gerrit is Getting Native with RPM, Deb and Docker
Gerrit is Getting Native with RPM, Deb and DockerGerrit is Getting Native with RPM, Deb and Docker
Gerrit is Getting Native with RPM, Deb and DockerLuca Milanesio
 
GitLab 8.5 Highlights and Step-by-step tutorial
GitLab 8.5 Highlights and Step-by-step tutorialGitLab 8.5 Highlights and Step-by-step tutorial
GitLab 8.5 Highlights and Step-by-step tutorialHeather McNamee
 
GitLab 8.6 - Release Webcast
GitLab 8.6 - Release Webcast GitLab 8.6 - Release Webcast
GitLab 8.6 - Release Webcast GitLab, Inc
 
Gerrit jenkins-big data-continuous-delivery
Gerrit jenkins-big data-continuous-deliveryGerrit jenkins-big data-continuous-delivery
Gerrit jenkins-big data-continuous-deliveryLuca Milanesio
 
Gerrit & Jenkins Workflow: An Integrated CI Demonstration
Gerrit & Jenkins Workflow: An Integrated CI DemonstrationGerrit & Jenkins Workflow: An Integrated CI Demonstration
Gerrit & Jenkins Workflow: An Integrated CI Demonstrationvanoorts
 
Introducing GitLab (June 2018)
Introducing GitLab (June 2018)Introducing GitLab (June 2018)
Introducing GitLab (June 2018)Noa Harel
 
GitLab as an Alternative Development Platform for Github.com
GitLab as an Alternative Development Platform for Github.comGitLab as an Alternative Development Platform for Github.com
GitLab as an Alternative Development Platform for Github.comB1 Systems GmbH
 
Code Review with Git and Gerrit - Devoxx 2011 - Tools in Action - 2011-11-14
Code Review with Git and Gerrit - Devoxx 2011 - Tools in Action - 2011-11-14Code Review with Git and Gerrit - Devoxx 2011 - Tools in Action - 2011-11-14
Code Review with Git and Gerrit - Devoxx 2011 - Tools in Action - 2011-11-14msohn
 
Git and Gerrit Code Review - Tech Talk - 2010_09_23
Git and Gerrit Code Review - Tech Talk - 2010_09_23Git and Gerrit Code Review - Tech Talk - 2010_09_23
Git and Gerrit Code Review - Tech Talk - 2010_09_23msohn
 

Was ist angesagt? (20)

Git & GitLab
Git & GitLabGit & GitLab
Git & GitLab
 
What's New for GitLab CI/CD February 2020
What's New for GitLab CI/CD February 2020What's New for GitLab CI/CD February 2020
What's New for GitLab CI/CD February 2020
 
GitLab: One Tool for Software Development (2018-02-06 @ SEIUM, Braga, Portugal)
GitLab: One Tool for Software Development (2018-02-06 @ SEIUM, Braga, Portugal)GitLab: One Tool for Software Development (2018-02-06 @ SEIUM, Braga, Portugal)
GitLab: One Tool for Software Development (2018-02-06 @ SEIUM, Braga, Portugal)
 
What's New in GitLab and Software Development Trends
What's New in GitLab and Software Development TrendsWhat's New in GitLab and Software Development Trends
What's New in GitLab and Software Development Trends
 
Gerrit Code Review Analytics
Gerrit Code Review AnalyticsGerrit Code Review Analytics
Gerrit Code Review Analytics
 
GerritHub.io - present, past, future
GerritHub.io - present, past, futureGerritHub.io - present, past, future
GerritHub.io - present, past, future
 
Flex and .NET Integration
Flex and .NET IntegrationFlex and .NET Integration
Flex and .NET Integration
 
Up GitLab Presentation 2015
Up GitLab Presentation 2015Up GitLab Presentation 2015
Up GitLab Presentation 2015
 
Introducing GitLab (September 2018)
Introducing GitLab (September 2018)Introducing GitLab (September 2018)
Introducing GitLab (September 2018)
 
GitLab webcast - Release 8.4
GitLab webcast - Release 8.4GitLab webcast - Release 8.4
GitLab webcast - Release 8.4
 
Speed up Continuous Delivery with BigData Analytics
Speed up Continuous Delivery with BigData AnalyticsSpeed up Continuous Delivery with BigData Analytics
Speed up Continuous Delivery with BigData Analytics
 
Gerrit is Getting Native with RPM, Deb and Docker
Gerrit is Getting Native with RPM, Deb and DockerGerrit is Getting Native with RPM, Deb and Docker
Gerrit is Getting Native with RPM, Deb and Docker
 
GitLab 8.5 Highlights and Step-by-step tutorial
GitLab 8.5 Highlights and Step-by-step tutorialGitLab 8.5 Highlights and Step-by-step tutorial
GitLab 8.5 Highlights and Step-by-step tutorial
 
GitLab 8.6 - Release Webcast
GitLab 8.6 - Release Webcast GitLab 8.6 - Release Webcast
GitLab 8.6 - Release Webcast
 
Gerrit jenkins-big data-continuous-delivery
Gerrit jenkins-big data-continuous-deliveryGerrit jenkins-big data-continuous-delivery
Gerrit jenkins-big data-continuous-delivery
 
Gerrit & Jenkins Workflow: An Integrated CI Demonstration
Gerrit & Jenkins Workflow: An Integrated CI DemonstrationGerrit & Jenkins Workflow: An Integrated CI Demonstration
Gerrit & Jenkins Workflow: An Integrated CI Demonstration
 
Introducing GitLab (June 2018)
Introducing GitLab (June 2018)Introducing GitLab (June 2018)
Introducing GitLab (June 2018)
 
GitLab as an Alternative Development Platform for Github.com
GitLab as an Alternative Development Platform for Github.comGitLab as an Alternative Development Platform for Github.com
GitLab as an Alternative Development Platform for Github.com
 
Code Review with Git and Gerrit - Devoxx 2011 - Tools in Action - 2011-11-14
Code Review with Git and Gerrit - Devoxx 2011 - Tools in Action - 2011-11-14Code Review with Git and Gerrit - Devoxx 2011 - Tools in Action - 2011-11-14
Code Review with Git and Gerrit - Devoxx 2011 - Tools in Action - 2011-11-14
 
Git and Gerrit Code Review - Tech Talk - 2010_09_23
Git and Gerrit Code Review - Tech Talk - 2010_09_23Git and Gerrit Code Review - Tech Talk - 2010_09_23
Git and Gerrit Code Review - Tech Talk - 2010_09_23
 

Andere mochten auch

0601013 study stress at managerial level
0601013 study stress at managerial level0601013 study stress at managerial level
0601013 study stress at managerial levelSupa Buoy
 
Pašteta od celera
Pašteta od celera Pašteta od celera
Pašteta od celera gawwwra
 
Dvaree
DvareeDvaree
DvareeSale01
 
0601015 training & development
0601015 training & development0601015 training & development
0601015 training & developmentSupa Buoy
 
Circuits i maquines:Eric i Maria
Circuits i maquines:Eric i MariaCircuits i maquines:Eric i Maria
Circuits i maquines:Eric i Marialagessera
 
0601010 market research on advertising and brand image
0601010 market research on advertising and brand image  0601010 market research on advertising and brand image
0601010 market research on advertising and brand image Supa Buoy
 
0601024 equity research fundamental and technical analysis and its impact on...
0601024 equity research  fundamental and technical analysis and its impact on...0601024 equity research  fundamental and technical analysis and its impact on...
0601024 equity research fundamental and technical analysis and its impact on...Supa Buoy
 
My Digipak
My DigipakMy Digipak
My DigipakJoei Hen
 
0601040 identification and assessment of acoustic barriers
0601040 identification and assessment of acoustic barriers 0601040 identification and assessment of acoustic barriers
0601040 identification and assessment of acoustic barriers Supa Buoy
 
0301028 study of promotional activities at choithram llc
0301028 study of promotional activities at choithram llc0301028 study of promotional activities at choithram llc
0301028 study of promotional activities at choithram llcSupa Buoy
 
Evaluation Question 2
Evaluation Question 2 Evaluation Question 2
Evaluation Question 2 Joei Hen
 
Competitive analysis of depositary service provider in nagpur
Competitive analysis of depositary service provider in nagpurCompetitive analysis of depositary service provider in nagpur
Competitive analysis of depositary service provider in nagpurSupa Buoy
 
15 lecture presentation0 (1)
15 lecture presentation0 (1)15 lecture presentation0 (1)
15 lecture presentation0 (1)Uconn Stamford
 
Why Do Men Commit Suicide More Than Women?
Why Do Men Commit Suicide More Than Women?Why Do Men Commit Suicide More Than Women?
Why Do Men Commit Suicide More Than Women?Peter Orszag
 
Ma ch 03 economic decision makers (1)
Ma ch 03 economic decision makers (1)Ma ch 03 economic decision makers (1)
Ma ch 03 economic decision makers (1)Uconn Stamford
 

Andere mochten auch (20)

0601013 study stress at managerial level
0601013 study stress at managerial level0601013 study stress at managerial level
0601013 study stress at managerial level
 
Pašteta od celera
Pašteta od celera Pašteta od celera
Pašteta od celera
 
Anna Vila
Anna VilaAnna Vila
Anna Vila
 
Chapter 18 notes
Chapter 18 notesChapter 18 notes
Chapter 18 notes
 
Dvaree
DvareeDvaree
Dvaree
 
0601015 training & development
0601015 training & development0601015 training & development
0601015 training & development
 
Circuits i maquines:Eric i Maria
Circuits i maquines:Eric i MariaCircuits i maquines:Eric i Maria
Circuits i maquines:Eric i Maria
 
0601010 market research on advertising and brand image
0601010 market research on advertising and brand image  0601010 market research on advertising and brand image
0601010 market research on advertising and brand image
 
0601024 equity research fundamental and technical analysis and its impact on...
0601024 equity research  fundamental and technical analysis and its impact on...0601024 equity research  fundamental and technical analysis and its impact on...
0601024 equity research fundamental and technical analysis and its impact on...
 
My Digipak
My DigipakMy Digipak
My Digipak
 
0601040 identification and assessment of acoustic barriers
0601040 identification and assessment of acoustic barriers 0601040 identification and assessment of acoustic barriers
0601040 identification and assessment of acoustic barriers
 
Ch04 lecture (2)
Ch04 lecture (2)Ch04 lecture (2)
Ch04 lecture (2)
 
0301028 study of promotional activities at choithram llc
0301028 study of promotional activities at choithram llc0301028 study of promotional activities at choithram llc
0301028 study of promotional activities at choithram llc
 
Evaluation Question 2
Evaluation Question 2 Evaluation Question 2
Evaluation Question 2
 
Sfs4e ppt 05
Sfs4e ppt 05Sfs4e ppt 05
Sfs4e ppt 05
 
Ch13 lecture0 (1)
Ch13 lecture0 (1)Ch13 lecture0 (1)
Ch13 lecture0 (1)
 
Competitive analysis of depositary service provider in nagpur
Competitive analysis of depositary service provider in nagpurCompetitive analysis of depositary service provider in nagpur
Competitive analysis of depositary service provider in nagpur
 
15 lecture presentation0 (1)
15 lecture presentation0 (1)15 lecture presentation0 (1)
15 lecture presentation0 (1)
 
Why Do Men Commit Suicide More Than Women?
Why Do Men Commit Suicide More Than Women?Why Do Men Commit Suicide More Than Women?
Why Do Men Commit Suicide More Than Women?
 
Ma ch 03 economic decision makers (1)
Ma ch 03 economic decision makers (1)Ma ch 03 economic decision makers (1)
Ma ch 03 economic decision makers (1)
 

Ähnlich wie Diffy gets enterprise grade

Git Gerrit Mit Teamforge
Git Gerrit Mit TeamforgeGit Gerrit Mit Teamforge
Git Gerrit Mit TeamforgeCollabNet
 
Enterprise Git Adoption Webinar - Chinese
Enterprise Git Adoption Webinar - ChineseEnterprise Git Adoption Webinar - Chinese
Enterprise Git Adoption Webinar - ChineseCollabNet
 
Git/Gerrit with TeamForge
Git/Gerrit with TeamForgeGit/Gerrit with TeamForge
Git/Gerrit with TeamForgeCollabNet
 
Better, Faster, Easier: How to Make Git Really Work in the Enterprise
Better, Faster, Easier: How to Make Git Really Work in the EnterpriseBetter, Faster, Easier: How to Make Git Really Work in the Enterprise
Better, Faster, Easier: How to Make Git Really Work in the EnterprisePerforce
 
Optimize Your Enterprise Git Webinar
Optimize Your Enterprise Git WebinarOptimize Your Enterprise Git Webinar
Optimize Your Enterprise Git WebinarCollabNet
 
Git ops & Continuous Infrastructure with terra*
Git ops  & Continuous Infrastructure with terra*Git ops  & Continuous Infrastructure with terra*
Git ops & Continuous Infrastructure with terra*Haggai Philip Zagury
 
Don't Let Git Get Your Goat!
Don't Let Git Get Your Goat!Don't Let Git Get Your Goat!
Don't Let Git Get Your Goat!CollabNet
 
Speeding up your team with GitOps
Speeding up your team with GitOpsSpeeding up your team with GitOps
Speeding up your team with GitOpsBrice Fernandes
 
How to Achieve 80% Faster Builds and DevOps at Scale With Git
How to Achieve 80% Faster Builds and DevOps at Scale With Git How to Achieve 80% Faster Builds and DevOps at Scale With Git
How to Achieve 80% Faster Builds and DevOps at Scale With Git Perforce
 
Managing Github via Terrafom.pdf
Managing Github via Terrafom.pdfManaging Github via Terrafom.pdf
Managing Github via Terrafom.pdfmicharaeck
 
Delivering Quality at Speed with GitOps
Delivering Quality at Speed with GitOpsDelivering Quality at Speed with GitOps
Delivering Quality at Speed with GitOpsWeaveworks
 
A Reference Architecture to Enable Visibility and Traceability across the Ent...
A Reference Architecture to Enable Visibility and Traceability across the Ent...A Reference Architecture to Enable Visibility and Traceability across the Ent...
A Reference Architecture to Enable Visibility and Traceability across the Ent...CollabNet
 
TaraVault Overview Presentation (2021)
TaraVault Overview Presentation (2021)TaraVault Overview Presentation (2021)
TaraVault Overview Presentation (2021)Inflectra
 
A proven path for migrating from clearcase to git and or subversion
A proven path for migrating from clearcase to git and or subversionA proven path for migrating from clearcase to git and or subversion
A proven path for migrating from clearcase to git and or subversionCollabNet
 
Continuous Security for GitOps
Continuous Security for GitOpsContinuous Security for GitOps
Continuous Security for GitOpsWeaveworks
 
Self Hosted Web-based GIT Repository Managers
Self Hosted Web-based GIT Repository ManagersSelf Hosted Web-based GIT Repository Managers
Self Hosted Web-based GIT Repository ManagersPurav Gandhi
 
DevOps Online Training in Hyderabad
DevOps Online Training in HyderabadDevOps Online Training in Hyderabad
DevOps Online Training in HyderabadVisualpath Training
 
Hardening Your CI/CD Pipelines with GitOps and Continuous Security
Hardening Your CI/CD Pipelines with GitOps and Continuous SecurityHardening Your CI/CD Pipelines with GitOps and Continuous Security
Hardening Your CI/CD Pipelines with GitOps and Continuous SecurityWeaveworks
 
A case study why Zoominfo uses Terraform Cloud in high-scale environment.
A case study why Zoominfo uses Terraform Cloud in high-scale environment. A case study why Zoominfo uses Terraform Cloud in high-scale environment.
A case study why Zoominfo uses Terraform Cloud in high-scale environment. Tal Hibner
 
Git Merge Conflict Tutorial | Resolving Merge Conflicts In Git | DevOps Train...
Git Merge Conflict Tutorial | Resolving Merge Conflicts In Git | DevOps Train...Git Merge Conflict Tutorial | Resolving Merge Conflicts In Git | DevOps Train...
Git Merge Conflict Tutorial | Resolving Merge Conflicts In Git | DevOps Train...Edureka!
 

Ähnlich wie Diffy gets enterprise grade (20)

Git Gerrit Mit Teamforge
Git Gerrit Mit TeamforgeGit Gerrit Mit Teamforge
Git Gerrit Mit Teamforge
 
Enterprise Git Adoption Webinar - Chinese
Enterprise Git Adoption Webinar - ChineseEnterprise Git Adoption Webinar - Chinese
Enterprise Git Adoption Webinar - Chinese
 
Git/Gerrit with TeamForge
Git/Gerrit with TeamForgeGit/Gerrit with TeamForge
Git/Gerrit with TeamForge
 
Better, Faster, Easier: How to Make Git Really Work in the Enterprise
Better, Faster, Easier: How to Make Git Really Work in the EnterpriseBetter, Faster, Easier: How to Make Git Really Work in the Enterprise
Better, Faster, Easier: How to Make Git Really Work in the Enterprise
 
Optimize Your Enterprise Git Webinar
Optimize Your Enterprise Git WebinarOptimize Your Enterprise Git Webinar
Optimize Your Enterprise Git Webinar
 
Git ops & Continuous Infrastructure with terra*
Git ops  & Continuous Infrastructure with terra*Git ops  & Continuous Infrastructure with terra*
Git ops & Continuous Infrastructure with terra*
 
Don't Let Git Get Your Goat!
Don't Let Git Get Your Goat!Don't Let Git Get Your Goat!
Don't Let Git Get Your Goat!
 
Speeding up your team with GitOps
Speeding up your team with GitOpsSpeeding up your team with GitOps
Speeding up your team with GitOps
 
How to Achieve 80% Faster Builds and DevOps at Scale With Git
How to Achieve 80% Faster Builds and DevOps at Scale With Git How to Achieve 80% Faster Builds and DevOps at Scale With Git
How to Achieve 80% Faster Builds and DevOps at Scale With Git
 
Managing Github via Terrafom.pdf
Managing Github via Terrafom.pdfManaging Github via Terrafom.pdf
Managing Github via Terrafom.pdf
 
Delivering Quality at Speed with GitOps
Delivering Quality at Speed with GitOpsDelivering Quality at Speed with GitOps
Delivering Quality at Speed with GitOps
 
A Reference Architecture to Enable Visibility and Traceability across the Ent...
A Reference Architecture to Enable Visibility and Traceability across the Ent...A Reference Architecture to Enable Visibility and Traceability across the Ent...
A Reference Architecture to Enable Visibility and Traceability across the Ent...
 
TaraVault Overview Presentation (2021)
TaraVault Overview Presentation (2021)TaraVault Overview Presentation (2021)
TaraVault Overview Presentation (2021)
 
A proven path for migrating from clearcase to git and or subversion
A proven path for migrating from clearcase to git and or subversionA proven path for migrating from clearcase to git and or subversion
A proven path for migrating from clearcase to git and or subversion
 
Continuous Security for GitOps
Continuous Security for GitOpsContinuous Security for GitOps
Continuous Security for GitOps
 
Self Hosted Web-based GIT Repository Managers
Self Hosted Web-based GIT Repository ManagersSelf Hosted Web-based GIT Repository Managers
Self Hosted Web-based GIT Repository Managers
 
DevOps Online Training in Hyderabad
DevOps Online Training in HyderabadDevOps Online Training in Hyderabad
DevOps Online Training in Hyderabad
 
Hardening Your CI/CD Pipelines with GitOps and Continuous Security
Hardening Your CI/CD Pipelines with GitOps and Continuous SecurityHardening Your CI/CD Pipelines with GitOps and Continuous Security
Hardening Your CI/CD Pipelines with GitOps and Continuous Security
 
A case study why Zoominfo uses Terraform Cloud in high-scale environment.
A case study why Zoominfo uses Terraform Cloud in high-scale environment. A case study why Zoominfo uses Terraform Cloud in high-scale environment.
A case study why Zoominfo uses Terraform Cloud in high-scale environment.
 
Git Merge Conflict Tutorial | Resolving Merge Conflicts In Git | DevOps Train...
Git Merge Conflict Tutorial | Resolving Merge Conflicts In Git | DevOps Train...Git Merge Conflict Tutorial | Resolving Merge Conflicts In Git | DevOps Train...
Git Merge Conflict Tutorial | Resolving Merge Conflicts In Git | DevOps Train...
 

Kürzlich hochgeladen

Dreaming Music Video Treatment _ Project & Portfolio III
Dreaming Music Video Treatment _ Project & Portfolio IIIDreaming Music Video Treatment _ Project & Portfolio III
Dreaming Music Video Treatment _ Project & Portfolio IIINhPhngng3
 
SaaStr Workshop Wednesday w/ Lucas Price, Yardstick
SaaStr Workshop Wednesday w/ Lucas Price, YardstickSaaStr Workshop Wednesday w/ Lucas Price, Yardstick
SaaStr Workshop Wednesday w/ Lucas Price, Yardsticksaastr
 
If this Giant Must Walk: A Manifesto for a New Nigeria
If this Giant Must Walk: A Manifesto for a New NigeriaIf this Giant Must Walk: A Manifesto for a New Nigeria
If this Giant Must Walk: A Manifesto for a New NigeriaKayode Fayemi
 
ANCHORING SCRIPT FOR A CULTURAL EVENT.docx
ANCHORING SCRIPT FOR A CULTURAL EVENT.docxANCHORING SCRIPT FOR A CULTURAL EVENT.docx
ANCHORING SCRIPT FOR A CULTURAL EVENT.docxNikitaBankoti2
 
Presentation on Engagement in Book Clubs
Presentation on Engagement in Book ClubsPresentation on Engagement in Book Clubs
Presentation on Engagement in Book Clubssamaasim06
 
AWS Data Engineer Associate (DEA-C01) Exam Dumps 2024.pdf
AWS Data Engineer Associate (DEA-C01) Exam Dumps 2024.pdfAWS Data Engineer Associate (DEA-C01) Exam Dumps 2024.pdf
AWS Data Engineer Associate (DEA-C01) Exam Dumps 2024.pdfSkillCertProExams
 
Mohammad_Alnahdi_Oral_Presentation_Assignment.pptx
Mohammad_Alnahdi_Oral_Presentation_Assignment.pptxMohammad_Alnahdi_Oral_Presentation_Assignment.pptx
Mohammad_Alnahdi_Oral_Presentation_Assignment.pptxmohammadalnahdi22
 
Report Writing Webinar Training
Report Writing Webinar TrainingReport Writing Webinar Training
Report Writing Webinar TrainingKylaCullinane
 
Uncommon Grace The Autobiography of Isaac Folorunso
Uncommon Grace The Autobiography of Isaac FolorunsoUncommon Grace The Autobiography of Isaac Folorunso
Uncommon Grace The Autobiography of Isaac FolorunsoKayode Fayemi
 
VVIP Call Girls Nalasopara : 9892124323, Call Girls in Nalasopara Services
VVIP Call Girls Nalasopara : 9892124323, Call Girls in Nalasopara ServicesVVIP Call Girls Nalasopara : 9892124323, Call Girls in Nalasopara Services
VVIP Call Girls Nalasopara : 9892124323, Call Girls in Nalasopara ServicesPooja Nehwal
 
Chiulli_Aurora_Oman_Raffaele_Beowulf.pptx
Chiulli_Aurora_Oman_Raffaele_Beowulf.pptxChiulli_Aurora_Oman_Raffaele_Beowulf.pptx
Chiulli_Aurora_Oman_Raffaele_Beowulf.pptxraffaeleoman
 
Air breathing and respiratory adaptations in diver animals
Air breathing and respiratory adaptations in diver animalsAir breathing and respiratory adaptations in diver animals
Air breathing and respiratory adaptations in diver animalsaqsarehman5055
 
Dreaming Marissa Sánchez Music Video Treatment
Dreaming Marissa Sánchez Music Video TreatmentDreaming Marissa Sánchez Music Video Treatment
Dreaming Marissa Sánchez Music Video Treatmentnswingard
 
BDSM⚡Call Girls in Sector 97 Noida Escorts >༒8448380779 Escort Service
BDSM⚡Call Girls in Sector 97 Noida Escorts >༒8448380779 Escort ServiceBDSM⚡Call Girls in Sector 97 Noida Escorts >༒8448380779 Escort Service
BDSM⚡Call Girls in Sector 97 Noida Escorts >༒8448380779 Escort ServiceDelhi Call girls
 
My Presentation "In Your Hands" by Halle Bailey
My Presentation "In Your Hands" by Halle BaileyMy Presentation "In Your Hands" by Halle Bailey
My Presentation "In Your Hands" by Halle Baileyhlharris
 
Introduction to Prompt Engineering (Focusing on ChatGPT)
Introduction to Prompt Engineering (Focusing on ChatGPT)Introduction to Prompt Engineering (Focusing on ChatGPT)
Introduction to Prompt Engineering (Focusing on ChatGPT)Chameera Dedduwage
 
Re-membering the Bard: Revisiting The Compleat Wrks of Wllm Shkspr (Abridged)...
Re-membering the Bard: Revisiting The Compleat Wrks of Wllm Shkspr (Abridged)...Re-membering the Bard: Revisiting The Compleat Wrks of Wllm Shkspr (Abridged)...
Re-membering the Bard: Revisiting The Compleat Wrks of Wllm Shkspr (Abridged)...Hasting Chen
 
The workplace ecosystem of the future 24.4.2024 Fabritius_share ii.pdf
The workplace ecosystem of the future 24.4.2024 Fabritius_share ii.pdfThe workplace ecosystem of the future 24.4.2024 Fabritius_share ii.pdf
The workplace ecosystem of the future 24.4.2024 Fabritius_share ii.pdfSenaatti-kiinteistöt
 
Thirunelveli call girls Tamil escorts 7877702510
Thirunelveli call girls Tamil escorts 7877702510Thirunelveli call girls Tamil escorts 7877702510
Thirunelveli call girls Tamil escorts 7877702510Vipesco
 

Kürzlich hochgeladen (20)

Dreaming Music Video Treatment _ Project & Portfolio III
Dreaming Music Video Treatment _ Project & Portfolio IIIDreaming Music Video Treatment _ Project & Portfolio III
Dreaming Music Video Treatment _ Project & Portfolio III
 
SaaStr Workshop Wednesday w/ Lucas Price, Yardstick
SaaStr Workshop Wednesday w/ Lucas Price, YardstickSaaStr Workshop Wednesday w/ Lucas Price, Yardstick
SaaStr Workshop Wednesday w/ Lucas Price, Yardstick
 
If this Giant Must Walk: A Manifesto for a New Nigeria
If this Giant Must Walk: A Manifesto for a New NigeriaIf this Giant Must Walk: A Manifesto for a New Nigeria
If this Giant Must Walk: A Manifesto for a New Nigeria
 
ANCHORING SCRIPT FOR A CULTURAL EVENT.docx
ANCHORING SCRIPT FOR A CULTURAL EVENT.docxANCHORING SCRIPT FOR A CULTURAL EVENT.docx
ANCHORING SCRIPT FOR A CULTURAL EVENT.docx
 
Presentation on Engagement in Book Clubs
Presentation on Engagement in Book ClubsPresentation on Engagement in Book Clubs
Presentation on Engagement in Book Clubs
 
AWS Data Engineer Associate (DEA-C01) Exam Dumps 2024.pdf
AWS Data Engineer Associate (DEA-C01) Exam Dumps 2024.pdfAWS Data Engineer Associate (DEA-C01) Exam Dumps 2024.pdf
AWS Data Engineer Associate (DEA-C01) Exam Dumps 2024.pdf
 
Mohammad_Alnahdi_Oral_Presentation_Assignment.pptx
Mohammad_Alnahdi_Oral_Presentation_Assignment.pptxMohammad_Alnahdi_Oral_Presentation_Assignment.pptx
Mohammad_Alnahdi_Oral_Presentation_Assignment.pptx
 
Report Writing Webinar Training
Report Writing Webinar TrainingReport Writing Webinar Training
Report Writing Webinar Training
 
Uncommon Grace The Autobiography of Isaac Folorunso
Uncommon Grace The Autobiography of Isaac FolorunsoUncommon Grace The Autobiography of Isaac Folorunso
Uncommon Grace The Autobiography of Isaac Folorunso
 
VVIP Call Girls Nalasopara : 9892124323, Call Girls in Nalasopara Services
VVIP Call Girls Nalasopara : 9892124323, Call Girls in Nalasopara ServicesVVIP Call Girls Nalasopara : 9892124323, Call Girls in Nalasopara Services
VVIP Call Girls Nalasopara : 9892124323, Call Girls in Nalasopara Services
 
Chiulli_Aurora_Oman_Raffaele_Beowulf.pptx
Chiulli_Aurora_Oman_Raffaele_Beowulf.pptxChiulli_Aurora_Oman_Raffaele_Beowulf.pptx
Chiulli_Aurora_Oman_Raffaele_Beowulf.pptx
 
Air breathing and respiratory adaptations in diver animals
Air breathing and respiratory adaptations in diver animalsAir breathing and respiratory adaptations in diver animals
Air breathing and respiratory adaptations in diver animals
 
ICT role in 21st century education and it's challenges.pdf
ICT role in 21st century education and it's challenges.pdfICT role in 21st century education and it's challenges.pdf
ICT role in 21st century education and it's challenges.pdf
 
Dreaming Marissa Sánchez Music Video Treatment
Dreaming Marissa Sánchez Music Video TreatmentDreaming Marissa Sánchez Music Video Treatment
Dreaming Marissa Sánchez Music Video Treatment
 
BDSM⚡Call Girls in Sector 97 Noida Escorts >༒8448380779 Escort Service
BDSM⚡Call Girls in Sector 97 Noida Escorts >༒8448380779 Escort ServiceBDSM⚡Call Girls in Sector 97 Noida Escorts >༒8448380779 Escort Service
BDSM⚡Call Girls in Sector 97 Noida Escorts >༒8448380779 Escort Service
 
My Presentation "In Your Hands" by Halle Bailey
My Presentation "In Your Hands" by Halle BaileyMy Presentation "In Your Hands" by Halle Bailey
My Presentation "In Your Hands" by Halle Bailey
 
Introduction to Prompt Engineering (Focusing on ChatGPT)
Introduction to Prompt Engineering (Focusing on ChatGPT)Introduction to Prompt Engineering (Focusing on ChatGPT)
Introduction to Prompt Engineering (Focusing on ChatGPT)
 
Re-membering the Bard: Revisiting The Compleat Wrks of Wllm Shkspr (Abridged)...
Re-membering the Bard: Revisiting The Compleat Wrks of Wllm Shkspr (Abridged)...Re-membering the Bard: Revisiting The Compleat Wrks of Wllm Shkspr (Abridged)...
Re-membering the Bard: Revisiting The Compleat Wrks of Wllm Shkspr (Abridged)...
 
The workplace ecosystem of the future 24.4.2024 Fabritius_share ii.pdf
The workplace ecosystem of the future 24.4.2024 Fabritius_share ii.pdfThe workplace ecosystem of the future 24.4.2024 Fabritius_share ii.pdf
The workplace ecosystem of the future 24.4.2024 Fabritius_share ii.pdf
 
Thirunelveli call girls Tamil escorts 7877702510
Thirunelveli call girls Tamil escorts 7877702510Thirunelveli call girls Tamil escorts 7877702510
Thirunelveli call girls Tamil escorts 7877702510
 

Diffy gets enterprise grade

  • 1. 1 Copyright ©2014 CollabNet, Inc. All Rights Reserved.ENTERPRISE CLOUD DEVELOPMENT TeamForge integration with Git/Gerrit Diffy gets Enterprise gradeDiffy gets Enterprise grade TeamForge Gerrit IntegrationTeamForge Gerrit Integration Eryk SzymanskiEryk Szymanski Dariusz LukszaDariusz Luksza CollabNet Engineering, Potsdam, GermanyCollabNet Engineering, Potsdam, Germany
  • 2. 2 Copyright ©2014 CollabNet, Inc. All Rights Reserved. TeamForgeTeamForge
  • 3. 3 Copyright ©2014 CollabNet, Inc. All Rights Reserved. …… and the Enterpriseand the Enterprise
  • 4. 4 Copyright ©2014 CollabNet, Inc. All Rights Reserved. Enterprise GradeEnterprise Grade Integration of existing  tools Security, standards and audit  compliance Scalability (and manageability at  scale)
  • 5. 5 Copyright ©2014 CollabNet, Inc. All Rights Reserved. Enterprise GradeEnterprise Grade SearchabilitySearchability – across TF artifacts, including Code Search across multiple– across TF artifacts, including Code Search across multiple repositories, gerrit instances and other SCM tools.repositories, gerrit instances and other SCM tools. Traceability –Traceability – associating the source code with requirements, issues, documents, tasks and other artifacts. RBAC –RBAC – Role Based Access Control – permissions to perform certain operations are assigned to roles. Management of individual permissions becomes a matter of simply assigning appropriate roles to the given users.
  • 6. 6 Copyright ©2014 CollabNet, Inc. All Rights Reserved.ENTERPRISE CLOUD DEVELOPMENT TeamForge integration with Git/Gerrit Introducing Gerrit IntegrationIntroducing Gerrit Integration
  • 7. 7 Copyright ©2014 CollabNet, Inc. All Rights Reserved. TeamForge Gerrit IntegrationTeamForge Gerrit Integration Our mission:Our mission: Make Gerrit first-class citizen of TeamForge ecosystemMake Gerrit first-class citizen of TeamForge ecosystem ➔ Multiple Gerrit instances can be controlled by TeamForge. ➔ Make use of TeamForge features: ➔ Enable Source Code Search and Commit Objects. ➔ Use TeamForge RBAC for Access Rights. ➔ Make sure it is secure and audit compliant. ➔ Enable TeamForge-like look and feel (branding). ➔ But keep in mind that Gerrit is also a Git Server.
  • 8. 8 Copyright ©2014 CollabNet, Inc. All Rights Reserved. TeamForge Git/Gerrit IntegrationTeamForge Git/Gerrit Integration ➔ Managed by TeamForge ➔ Based on modified Gerrit 2.7 (about 70 patches) ➔ Plugins: sync, secure store, history protection, notification ➔ Custom branding
  • 9. 9 Copyright ©2014 CollabNet, Inc. All Rights Reserved. TeamForge Git/Gerrit IntegrationTeamForge Git/Gerrit Integration
  • 10. 10 Copyright ©2014 CollabNet, Inc. All Rights Reserved.ENTERPRISE CLOUD DEVELOPMENT TeamForge integration with Git/Gerrit ➢RepoCategory ➢History Protection ➢Notifications Features:
  • 11. 11 Copyright ©2014 CollabNet, Inc. All Rights Reserved. TF SCM permissionsTF SCM permissions
  • 12. 12 Copyright ©2014 CollabNet, Inc. All Rights Reserved. Gerrit Access RightsGerrit Access Rights
  • 13. 13 Copyright ©2014 CollabNet, Inc. All Rights Reserved. RepoCategory (aka Code Review Policy)RepoCategory (aka Code Review Policy) ImplementationImplementation:: ● MapMap TeamForge SCM permissions toTeamForge SCM permissions to Gerrit Access Rights.Gerrit Access Rights. ● Provide pre-definedProvide pre-defined code review policiescode review policies so anyone can start toso anyone can start to work with Gerrit within a few steps.work with Gerrit within a few steps. ● Code review policiesCode review policies are applied per repository.are applied per repository. Motivation:Motivation: Shield most users from Gerrit’s complexities by using pre-definedShield most users from Gerrit’s complexities by using pre-defined repo categories and generic TeamForge RBAC model with its SCMrepo categories and generic TeamForge RBAC model with its SCM permissions.permissions. Without hiding advanced features for power users.Without hiding advanced features for power users.
  • 14. 14 Copyright ©2014 CollabNet, Inc. All Rights Reserved. RepoCategoryRepoCategory
  • 15. 15 Copyright ©2014 CollabNet, Inc. All Rights Reserved. RepoCategoryRepoCategory ● DefaultDefault: All Gerrit review features are turned off ● Mandatory ReviewMandatory Review: All code changes have to be reviewed ● Optional ReviewOptional Review: Review feature is turned on but can be bypassed if necessary ● CustomCustom: Access rights have to be set manually in Gerrit Web UI and will not be overridden by TeamForge ● User-definedUser-defined: Possibility to define your own access rights controlled by TeamForge Pre defined & user-defined categoriesPre defined & user-defined categories
  • 16. 16 Copyright ©2014 CollabNet, Inc. All Rights Reserved. History RewriteHistory Rewrite
  • 17. 17 Copyright ©2014 CollabNet, Inc. All Rights Reserved. History ProtectionHistory Protection ● DetectsDetects force pushforce push andand branch deletionbranch deletion operationsoperations ● Creates aCreates a special referencespecial reference pointing to thepointing to the current statecurrent state ● ThisThis referencereference contains all necessary information such as:contains all necessary information such as: who made the change,who made the change, when was it done,when was it done, what was the branch/ref namewhat was the branch/ref name what are the old and new commit idswhat are the old and new commit ids ● Provides the possibility toProvides the possibility to ressurectressurect ● AA notification emailnotification email is sent automatically to members of theis sent automatically to members of the GerritGerrit ‘Administrators’‘Administrators’ groupgroup, and new entry in the, and new entry in the audit logaudit log is createdis created ● Can be appliedCan be applied globallyglobally for the wholefor the whole Gerrit ServerGerrit Server oror locallylocally for a givenfor a given repositoryrepository
  • 18. 18 Copyright ©2014 CollabNet, Inc. All Rights Reserved. HistoryHistory Protection - The ‘Un-do’ ButtonProtection - The ‘Un-do’ Button
  • 19. 19 Copyright ©2014 CollabNet, Inc. All Rights Reserved. History Protection - Audit ComplianceHistory Protection - Audit Compliance
  • 20. 20 Copyright ©2014 CollabNet, Inc. All Rights Reserved. NotificationsNotifications Motivation:Motivation: Bring the git push notifications mechanism from the gitmultimailBring the git push notifications mechanism from the gitmultimail script to TeamForgescript to TeamForge
  • 21. 21 Copyright ©2014 CollabNet, Inc. All Rights Reserved. NotificationsNotifications
  • 22. 22 Copyright ©2014 CollabNet, Inc. All Rights Reserved.ENTERPRISE CLOUD DEVELOPMENT TeamForge integration with Git/Gerrit Live DemoLive Demo
  • 23. 23 Copyright ©2014 CollabNet, Inc. All Rights Reserved.ENTERPRISE CLOUD DEVELOPMENT TeamForge integration with Git/Gerrit Thank you very much.Thank you very much. Questions?Questions?

Hinweis der Redaktion

  1. DSDP - Distributed Software Development Platform. ALM - Application Lifecycle Manangement. Integrates well with other tools. No matter which tool set you use you can configure and use it from TeamForge. Of course it provides it's own tools, such as Project Templates, Planning Folders, Trackers and Discussion Forums. TeamForge is targeting Enterprise Users
  2. Integration Security Scalability SAS 70 = Statement on Auditing Standards No. 70. Standard for Information Technology and related processes. CollabNet is SAS 70-certified vendor and we undergo annual audits by third parties to ensure complance with required regulation controls. The Federal Risk and Authorization Management Program (FedRAMP) is a government-wide program that provides a standardized approach to security assessment, authorization, and continuous monitoring for cloud products and services.
  3. Searchability Traceability RBAC And more, project templates, planing folders,
  4. http://blogs.collab.net/teamforge/gerrit-rebranding-what-if-collabnets-theme-was-orange-yellowish
  5. TF scm permissions are coarse-grained...
  6. .. as opposed to Gerrit Access Rights. This screenshot does not even show all the Access Rights – actually the whole list is a couple of screens longer
  7. <number>
  8. Bring the vanilla git notification feature back to gerrit.
  9. Bringing the vanilla git notification feature back to gerrit.