Go to file

Mirko Friedenhagen 1f397106f9 Add buildUrl in the description of the merge message. When you have more than one project which takes part in a merge request, it would be feasible to see directly which job voted in favor or not for the merge request. So add it it directly in the visible output.		2015-10-14 21:33:22 +02:00
src/main	Add buildUrl in the description of the merge message.	2015-10-14 21:33:22 +02:00
.gitignore	Ignore intellij files.	2015-10-12 17:39:25 -07:00
.travis.yml	Adding in base starter files for a hello world.	2014-05-20 10:06:20 -07:00
CHANGELOG.md	Updating readme and changelog	2015-10-12 20:49:57 -07:00
LICENSE	Initial commit	2014-05-20 09:50:12 -07:00
README.md	Updating bass rock username	2015-10-12 20:54:07 -07:00
gitlab-jenkins.iml	Changing artifact id	2014-07-06 12:57:34 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2015-10-12 20:51:35 -07:00

README.md

gitlab-plugin

This plugin emulates Jenkins as a GitlabCI Web Service to be used with GitlabHQ.

Current Supported GitLabCI Functions

/project/PROJECT_NAME/builds/COMMIT_SHA1/status.json (used for Merge Request pages) returns build result for Merge Request build with COMMIT_SHA1 as last commit
/project/PROJECT_NAME/builds/status.png?ref=BRANCH_NAME returns build status icon for latest build for BRANCH_NAME
/project/PROJECT_NAME/builds/status.png?sha1=COMMIT_SHA1 returns build status icon for latest build for COMMIT_SHA1 as last commit
/project/PROJECT_NAME/builds/COMMIT_SHA1 redirects to build page of the last build containing COMMIT_SHA1 as last commit
/project/PROJECT_NAME/commits/COMMIT_SHA1 redirects to build page of the last build containing COMMIT_SHA1 as last commit
/project/PROJECT_NAME?ref=BRANCH_NAME redirects to build page of the last build for BRANCH_NAME
/project/PROJECT_NAME triggers a build, type (Merge Request or Push) depending on payload

Help Needed

I am currently looking for someone to help maintain this project. This includes keeping up a Changelog, releasing builds, accepting merge requests, etc. If you are interested let @bassrock know and I can add you as a maintainer.

Configuring access to Gitlab

Optionally, the plugin communicates with the Gitlab server in order to fetch additional information. At this moment, this information is limited to fetching the source project of a Merge Request, in order to support merging from forked repositories.

To enable this functionality, a user should be set up on Gitlab, which adequate permissions to access the repository. On the global configuration screen, supply the gitlab host url http://your.gitlab.server and the API token of the user of choice.

Using it With A Job

Create a new job by going to New Job
Set the Project Name to whatever you like
If you have the GitHub plugin installed, feel free to specify the GitHub Project url as the url for the Gitlab project.
In the Source Code Management section:
- Click Git
- Enter your Repository URL (e.g.: git@your.gitlab.server:group/repo_name.git)
  - In the Advanced settings, set its Name to origin
- To be able to merge from forked repositories:
  Note: this requires configuring communication to the Gitlab server
  - Add a second repository with:
    - URL: ${gitlabSourceRepoURL}
    - Name (in Advanced): ${gitlabSourceRepoName}
- In Branch Specifier enter:
  - For single-repository setups: origin/${gitlabSourceBranch}
  - For forked repository setups: ${gitlabSourceRepoName}/${gitlabSourceBranch}
- In Additional Behaviours:
  - Click the Add drop-down button.
  - Select Merge before build from the drop-down.
  - Set *Name of the repository" to origin
  - Set Branch to merge as ${gitlabTargetBranch}
In the Build Triggers section:
- Check the Build when a change is pushed to GitLab.
- Use the check boxes to trigger builds on Push and/or Merge Request events
- Optionally enable building open merge requests again after a push to the source branch.
Configure any other pre build, build or post build actions as necessary
Click Save to preserve your changes in Jenkins.

GitLab Configuration (≥ 8.0)

In GitLab go to you primary repository's project Settings
- Click on Web Hooks
  - Add a Web Hook for Merge Request Events and Push Events to http://JENKINS_URL/project/PROJECT_NAME
    Note: Currently GitLab 8.0 does not have a commit status api. Once this is added we should be able to add the commit status to Gitlab.

If you plan to use forked repositories, you will need to enable the GitLab CI integration on each fork.

Go to the Settings page in each developer's fork
Click on Services
- Click on Web Hooks
  - Add a Web Hook for Merge Request Events and Push Events to http://JENKINS_URL/project/PROJECT_NAME
    Note: Currently GitLab 8.0 does not have a commit status api. Once this is added we should be able to add the commit status to Gitlab. Note: You do not need to select any "Trigger Events" as the Web Hook for Merge Request Events will alert Jenkins.

GitLab Configuration (< 8.0)

In GitLab go to you primary repository's project Settings
- Click on Services
- Click on GitLab CI
  - Check the Active checkbox
  - For Token put any random string (This is not yet functioning)
  - For Project URL put http://JENKINS_URL/project/PROJECT_NAME
  - Click Save
- Click on Web Hooks
  - Add a Web Hook for Merge Request Events to http://JENKINS_URL/project/PROJECT_NAME
    Note: GitLab for some reason does not send a merge request event with the GitLab Service.

If you plan to use forked repositories, you will need to enable the GitLab CI integration on each fork.

Go to the Settings page in each developer's fork
Click on Services
- Click on GitLab CI
  - Check the Active checkbox
  - For Token put any random string (This is not yet functioning)
  - For Project URL put http://JENKINS_URL/project/PROJECT_NAME
  - Click Save
    Note: You do not need to select any "Trigger Events" as the Web Hook for Merge Request Events will alert Jenkins.

Branch filtering

Triggers from push events may be filtered based on the branch name, i.e. the build will only be allowed for selected branches. On the project configuration page, a list of all branches on the remote repository is displayed under Build when a change is pushed to GitLab.. It is possible to select multiple branches by holding Ctrl and clicking.

This functionality requires accessing the Gitlab server (see above) and for the time being also a git repository url already saved in the project configuration. In other words, when creating a new project, the configuration needs to be saved once before being able to select the allowed branches. For existing projects, all branches are allowed to push by default.

Build Tags

In order to build when a new tag is pushed:

In the GitLab server add Tag push events to the Web Hook
In the Jenkins under the Source Code Management section:
- select Advance... and add +refs/tags/*:refs/remotes/origin/tags/* as Refspec
- you can also use Branch Specifier to specify which tag need to be built (exampple refs/tags/${TAGNAME})

Parameterized builds

You can trigger a job a manually by clicking This build is parameterized and adding the relevant build parameters. These include:

gitlabSourceBranch
gitlabTargetBranch
gitlabSourceRepoURL
gitlabSourceRepoName
gitlabBranch (This is optional and can be used in shell scripts for the branch being built by the push request)
gitlabActionType (This is optional and can be used in shell scripts or other plugins to change the build behaviour. Possible values are PUSH or MERGE)

Help Needed

/projects/ - seems to be already used by Jenkins, A way to use this path would be awesome
?token=XYZ - Can not find a way to include a token parameter on an AbstractProject to security check without an extra plugin configuration
/PROJECT_NAME/ should really be /PROJECT_ID_NUMBER/ - Can not find a project id number on an AbstractProject to use here instead.

Known Issues

GitLab CI Merge Status pages says pending when there is no build scheduled, or the status is unknown. This is because I coded a workaround until this bug gets resolved: https://github.com/gitlabhq/gitlabhq/issues/7047

Contributing

Fork it ( https://github.com/[my-github-username]/gitlab-plugin/fork )
Create your feature branch (git checkout -b my-new-feature)
Commit your changes (git commit -am 'Add some feature')
Push to the branch (git push origin my-new-feature)
Create a new Pull Request

Contributors

@bass_rock, base ground work, primary developer.
@DABSquared, company sponsoring development.
@xaniasd

Parts of this code inspired by https://github.com/timols/jenkins-gitlab-merge-request-builder-plugin