Difference between revisions of "Samba CI on gitlab"

From SambaWiki
Jump to: navigation, search
(Explain how to review code in GitLab)
(Restructure, clarify...)
Line 1: Line 1:
Samba has a [https://gitlab.com/samba-team/samba GitLab mirror] of the [https://git.samba.org/samba.git official git repository] used to aid development  
+
Samba has a [https://gitlab.com/samba-team/samba GitLab mirror] of the [https://git.samba.org/samba.git official git repository] used to aid development
  
=Samba Team members=
+
=Where is the Samba CI repo on GitLab?=
 +
 
 +
https://gitlab.com/samba-team/devel/samba
 +
 
 +
=Getting Access=
 +
 
 +
==Samba Team members==
  
 
Samba Team members are encouraged to join the Samba Team organisation here:
 
Samba Team members are encouraged to join the Samba Team organisation here:
  
* [https://gitlab.com/samba-team/ gitlab CI for Samba team member]
+
* [https://gitlab.com/samba-team/ GitLab Samba team]
  
==How to join==
+
Just ask on the team list from your team e-mail with your gitlab username.  
 
 
If you are a Samba Team member then you are entitled to access.  Just ask on the team list from your team e-mail with your gitlab username.  
 
  
 
A fellow team member with '''Maintainer''' rights can then add you a '''Developer''' via this page:
 
A fellow team member with '''Maintainer''' rights can then add you a '''Developer''' via this page:
Line 15: Line 19:
 
* [https://gitlab.com/groups/samba-team/-/group_members Samba team group members]
 
* [https://gitlab.com/groups/samba-team/-/group_members Samba team group members]
  
=Other Samba developers=
+
==Other Samba developers==
  
Our broader developer community is encouraged to apply to join a collaborative development repo here:
+
Our broader developer community is encouraged to apply to use the Samba CI repo. Access is given to folks active on the mailing list with patches to submit, not just to Samba Team members. 
  
* [https://gitlab.com/samba-team/devel/samba CI for Samba contributors]
+
Please write a mail to contributing@samba.org with details of your contribution history or plans and a Samba Team member with '''Maintainer''' rights can then add you as a '''Developer''' via this page:
  
==How to join==
+
* https://gitlab.com/samba-team/devel/samba/project_members
 +
 
 +
=Triggering CI=
  
Access is given to folks active on the mailing list with patches to submit, not just to Samba Team members. 
+
The '''git remote URL''' for the [https://gitlab.com/samba-team/devel/samba Samba CI repo] is
  
Please write a mail to contributing@samba.org with details of your contribution history or plans and a Samba Team member with '''Maintainer''' rights can then add you as a '''Developer''' via this page:
+
  git@gitlab.com:samba-team/devel/samba.git
  
* https://gitlab.com/samba-team/devel/samba/project_members
+
A CI run is triggered after every push.  This makes it easy to find issues early.
  
 
==Code of conduct==
 
==Code of conduct==
  
If using that, please prefix branches with your username, and be nice. Don't overwrite the work of others.   
+
Please prefix branches with your username, and be nice. Don't overwrite the work of others.   
  
 
In return you get a full CI run using Samba Team provided resources running thanks to a credit in Rackspace's cloud.  That in turn makes it easier for Samba Team members doing [[CodeReview|Code Review]] as your patches will work first time, and they can see proof of that.
 
In return you get a full CI run using Samba Team provided resources running thanks to a credit in Rackspace's cloud.  That in turn makes it easier for Samba Team members doing [[CodeReview|Code Review]] as your patches will work first time, and they can see proof of that.
  
==CI Results==
+
=CI Results=
  
A CI run is triggered after every push.  This makes finding issues early easy.
 
  
 
CI results are here: [https://gitlab.com/samba-team/devel/samba/pipelines Pipelines]
 
CI results are here: [https://gitlab.com/samba-team/devel/samba/pipelines Pipelines]

Revision as of 02:18, 18 September 2018

Samba has a GitLab mirror of the official git repository used to aid development

Where is the Samba CI repo on GitLab?

https://gitlab.com/samba-team/devel/samba

Getting Access

Samba Team members

Samba Team members are encouraged to join the Samba Team organisation here:

Just ask on the team list from your team e-mail with your gitlab username.

A fellow team member with Maintainer rights can then add you a Developer via this page:

Other Samba developers

Our broader developer community is encouraged to apply to use the Samba CI repo. Access is given to folks active on the mailing list with patches to submit, not just to Samba Team members.

Please write a mail to contributing@samba.org with details of your contribution history or plans and a Samba Team member with Maintainer rights can then add you as a Developer via this page:

Triggering CI

The git remote URL for the Samba CI repo is

 git@gitlab.com:samba-team/devel/samba.git

A CI run is triggered after every push. This makes it easy to find issues early.

Code of conduct

Please prefix branches with your username, and be nice. Don't overwrite the work of others.

In return you get a full CI run using Samba Team provided resources running thanks to a credit in Rackspace's cloud. That in turn makes it easier for Samba Team members doing Code Review as your patches will work first time, and they can see proof of that.

CI Results

CI results are here: Pipelines

CI for personal GitLab forks

Instructions how to run CI with your own GitLab runner can be found here: CI using Your own gitlab runner.

This is helpful if you do not wish to share the repository with others (you have your own fork on gitlab). However it requires your own build resources.

Merging patches from GitLab (for Samba Team members)

If the developer has created a merge request, then to merge, download the patch with (eg)

https://gitlab.com/samba-team/samba/merge_requests/12.patch

Add review tags and then 'git autobuild' locally. The merge button sadly doesn't work.

Then when the patch is in Samba.org's git master close the merge request a message like:

Merged into master as <git hash> for Samba <next version>.

See for example this closed merge request.