p85947160
/
Gitee-Jenkins-Plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clarify documentation of the webhook URL

This commit is contained in:
Owen Mehegan 2018-03-29 17:52:55 +11:00
parent acaab4d405
commit 9d8f7cc0f2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -203,8 +203,8 @@ node {
### Freestyle and Pipeline jobs ### Freestyle and Pipeline jobs
1. In the *Build Triggers* section: 1. In the *Build Triggers* section:
* Select *Build when a change is pushed to GitLab* * Select *Build when a change is pushed to GitLab*
* Make a note of the *GitLab CI Service URL* appearing on the same line with *Build when a change is * Copy the *GitLab webhook URL* appearing on the same line with *Build when a change is
pushed to GitLab*. You will later use this URL to define a GitLab web hook. pushed to GitLab*.
* Use the check boxes to trigger builds on *Push Events* and/or *Created Merge Request Events* and/or *Accepted Merge Request Events* and/or *Closed Merge Request Events* * Use the check boxes to trigger builds on *Push Events* and/or *Created Merge Request Events* and/or *Accepted Merge Request Events* and/or *Closed Merge Request Events*
* Optionally use *Rebuild open Merge Requests* to enable re-building open merge requests after a * Optionally use *Rebuild open Merge Requests* to enable re-building open merge requests after a
push to the source branch push to the source branch
@ -216,6 +216,7 @@ node {
Otherwise you might end up in a loop. Otherwise you might end up in a loop.
2. Configure any other pre build, build or post build actions as necessary 2. Configure any other pre build, build or post build actions as necessary
3. Click *Save* to preserve your changes in Jenkins. 3. Click *Save* to preserve your changes in Jenkins.
4. Create a webhook in the relevant GitLab projects (consult the GitLab documentation for instructions on this), and use the URL you copied from the Jenkins job configuration UI. It should look something like `http://JENKINS_URL/project/yourbuildname`
### Pipeline Multibranch jobs ### Pipeline Multibranch jobs
Unlike other job types, there is no 'Trigger' setting required for a Multibranch job configuration; just create a webhook in GitLab for push requests which points to ``http://JENKINS_URL/project/PROJECT_NAME`` or ``http://JENKINS_URL/project/FOLDER/PROJECT_NAME`` if the project in inside a folder in Jenkins. When GitLab POSTs to this URL, it will trigger branch indexing for the Jenkins project, and Jenkins will handle starting any builds necessary. Unlike other job types, there is no 'Trigger' setting required for a Multibranch job configuration; just create a webhook in GitLab for push requests which points to ``http://JENKINS_URL/project/PROJECT_NAME`` or ``http://JENKINS_URL/project/FOLDER/PROJECT_NAME`` if the project in inside a folder in Jenkins. When GitLab POSTs to this URL, it will trigger branch indexing for the Jenkins project, and Jenkins will handle starting any builds necessary.

2
src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
View File

@ -507,7 +507,7 @@ public class GitLabPushTrigger extends Trigger<Job<?, ?>> {
Job<?, ?> project = retrieveCurrentJob(); Job<?, ?> project = retrieveCurrentJob();
if (project != null) { if (project != null) {
try { try {
return "Build when a change is pushed to GitLab. GitLab CI Service URL: " + retrieveProjectUrl(project); return "Build when a change is pushed to GitLab. GitLab webhook URL: " + retrieveProjectUrl(project);
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
// nothing to do // nothing to do
} }