Added support for the GitLab 8.1 commit API #127
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,7 +40,6 @@ | |
| import jenkins.triggers.SCMTriggerItem; | ||
| import jenkins.triggers.SCMTriggerItem.SCMTriggerItems; | ||
| import net.sf.json.JSONObject; | ||
|
|
||
| import org.apache.commons.lang.StringUtils; | ||
| import org.eclipse.jgit.transport.RemoteConfig; | ||
|
|
@@ -82,21 +81,23 @@ public class GitLabPushTrigger extends Trigger<Job<?, ?>> { | |
| private boolean ciSkip = true; | ||
| private boolean setBuildDescription = true; | ||
| private boolean addNoteOnMergeRequest = true; | ||
| private boolean addCiMessage = false; | ||
| private boolean addVoteOnMergeRequest = true; | ||
| private boolean allowAllBranches = false; | ||
| private final String includeBranchesSpec; | ||
| private final String excludeBranchesSpec; | ||
| private boolean acceptMergeRequestOnSuccess = false; | ||
|
|
||
| @DataBoundConstructor | ||
| public GitLabPushTrigger(boolean triggerOnPush, boolean triggerOnMergeRequest, String triggerOpenMergeRequestOnPush, boolean ciSkip, boolean setBuildDescription, boolean addNoteOnMergeRequest, boolean addCiMessage, boolean addVoteOnMergeRequest, boolean acceptMergeRequestOnSuccess, boolean allowAllBranches, | ||
| String includeBranchesSpec, String excludeBranchesSpec) { | ||
| this.triggerOnPush = triggerOnPush; | ||
| this.triggerOnMergeRequest = triggerOnMergeRequest; | ||
| this.triggerOpenMergeRequestOnPush = triggerOpenMergeRequestOnPush; | ||
| this.ciSkip = ciSkip; | ||
| this.setBuildDescription = setBuildDescription; | ||
| this.addNoteOnMergeRequest = addNoteOnMergeRequest; | ||
| this.addCiMessage = addCiMessage; | ||
| this.addVoteOnMergeRequest = addVoteOnMergeRequest; | ||
| this.allowAllBranches = allowAllBranches; | ||
| this.includeBranchesSpec = includeBranchesSpec; | ||
|
|
@@ -132,6 +133,10 @@ public boolean getAllowAllBranches() { | |
| return allowAllBranches; | ||
| } | ||
|
|
||
| public boolean getAddCiMessage() { | ||
| return addCiMessage; | ||
| } | ||
|
|
||
| public boolean getCiSkip() { | ||
| return ciSkip; | ||
| } | ||
|
|
@@ -200,20 +205,18 @@ public void run() { | |
| } else { | ||
| LOGGER.log(Level.INFO, "GitLab Push Request detected in {0}. Job is already in the queue.", job.getName()); | ||
| } | ||
|
|
||
| if(addCiMessage) { | ||
| req.createCommitStatus(getDescriptor().getGitlab().instance(), "pending", Jenkins.getInstance().getRootUrl() + job.getUrl()); | ||
| } | ||
| } | ||
|
|
||
| private GitLabPushCause createGitLabPushCause(GitLabPushRequest req) { | ||
| GitLabPushCause cause; | ||
| try { | ||
| cause = new GitLabPushCause(req, getLogFile()); | ||
| } catch (IOException ex) { | ||
| cause = new GitLabPushCause(req); | ||
| } | ||
| return cause; | ||
| } | ||
|
|
@@ -230,15 +233,25 @@ private Action[] createActions(GitLabPushRequest req) { | |
| values.put("gitlabTargetBranch", new StringParameterValue("gitlabTargetBranch", branch)); | ||
| values.put("gitlabBranch", new StringParameterValue("gitlabBranch", branch)); | ||
|
|
||
| values.put("gitlabActionType", new StringParameterValue("gitlabActionType", "PUSH")); | ||
|
|
||
| LOGGER.log(Level.INFO, "Trying to get name and URL for job: {0}", job.getName()); | ||
| String sourceRepoName = getDesc().getSourceRepoNameDefault(job); | ||
| String sourceRepoURL = getDesc().getSourceRepoURLDefault(job).toString(); | ||
|
|
||
| if (!getDescriptor().getGitlabHostUrl().isEmpty()) { | ||
| // Get source repository if communication to Gitlab is possible | ||
| try { | ||
| sourceRepoName = req.getSourceProject(getDesc().getGitlab()).getPathWithNamespace(); | ||
| sourceRepoURL = req.getSourceProject(getDesc().getGitlab()).getSshUrl(); | ||
| } catch (IOException ex) { | ||
| LOGGER.log(Level.WARNING, "Could not fetch source project''s data from Gitlab. '('{0}':' {1}')'", new String[]{ex.toString(), ex.getMessage()}); | ||
| } | ||
| } | ||
|
|
||
| values.put("gitlabSourceRepoName", new StringParameterValue("gitlabSourceRepoName", sourceRepoName)); | ||
| values.put("gitlabSourceRepoURL", new StringParameterValue("gitlabSourceRepoURL", sourceRepoURL)); | ||
|
|
||
| List<ParameterValue> listValues = new ArrayList<ParameterValue>(values.values()); | ||
|
|
||
| ParametersAction parametersAction = new ParametersAction(listValues); | ||
|
|
@@ -296,6 +309,10 @@ protected Job asJob() { | |
| } else { | ||
| LOGGER.log(Level.INFO, "GitLab Merge Request detected in {0}. Job is already in the queue.", job.getName()); | ||
| } | ||
|
|
||
| if(addCiMessage) { | ||
| req.createCommitStatus(getDescriptor().getGitlab().instance(), "pending", Jenkins.getInstance().getRootUrl() + job.getUrl()); | ||
| } | ||
| } | ||
|
|
||
| private GitLabMergeCause createGitLabMergeCause(GitLabMergeRequest req) { | ||
|
|
@@ -379,14 +396,25 @@ private void setBuildCauseInJob(Run run){ | |
| } | ||
| } | ||
|
|
||
| public void onCompleted(Run run){ | ||
| Cause mCause= run.getCause(GitLabMergeCause.class); | ||
| if (mCause != null && mCause instanceof GitLabMergeCause) { | ||
| onCompleteMergeRequest(run, (GitLabMergeCause) mCause); | ||
| } | ||
|
|
||
| Cause pCause= run.getCause(GitLabPushCause.class); | ||
| if (pCause != null && pCause instanceof GitLabPushCause) { | ||
| onCompletedPushRequest(run, (GitLabPushCause) pCause); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private void onCompletedPushRequest(Run run, GitLabPushCause cause) { | ||
| if(addCiMessage) { | ||
| cause.getPushRequest().createCommitStatus(this.getDescriptor().getGitlab().instance(), run.getResult()==Result.SUCCESS?"success":"failure", Jenkins.getInstance().getRootUrl() + run.getUrl()); | ||
|
There was a problem hiding this comment. According to the commit status api documentation the status must be one of the following values:
|
||
| } | ||
| } | ||
|
|
||
| private void onCompleteMergeRequest(Run run,GitLabMergeCause cause){ | ||
| if (acceptMergeRequestOnSuccess && run.getResult() == Result.SUCCESS) { | ||
| try { | ||
|
|
@@ -423,10 +451,35 @@ private void onCompleteMergeRequest(Run run,GitLabMergeCause cause){ | |
| } | ||
| } | ||
|
|
||
| if(addCiMessage) { | ||
| cause.getMergeRequest().createCommitStatus(this.getDescriptor().getGitlab().instance(), run.getResult()==Result.SUCCESS?"success":"failure", Jenkins.getInstance().getRootUrl() + run.getUrl()); | ||
|
There was a problem hiding this comment. See comment above.
There was a problem hiding this comment. I'll make a pull request to fix this one ;) --EDIT-- |
||
| } | ||
| } | ||
|
|
||
| public void onStarted(Run run) { | ||
| setBuildCauseInJob(run); | ||
|
|
||
| Cause mCause= run.getCause(GitLabMergeCause.class); | ||
| if (mCause != null && mCause instanceof GitLabMergeCause) { | ||
| onStartedMergeRequest(run, (GitLabMergeCause) mCause); | ||
| } | ||
|
|
||
| Cause pCause= run.getCause(GitLabPushCause.class); | ||
| if (pCause != null && pCause instanceof GitLabPushCause) { | ||
| onStartedPushRequest(run, (GitLabPushCause) pCause); | ||
| } | ||
| } | ||
|
|
||
| private void onStartedPushRequest(Run run, GitLabPushCause cause) { | ||
| if(addCiMessage) { | ||
| cause.getPushRequest().createCommitStatus(this.getDescriptor().getGitlab().instance(), "running", Jenkins.getInstance().getRootUrl() + run.getUrl()); | ||
| } | ||
| } | ||
|
|
||
| private void onStartedMergeRequest(Run run, GitLabMergeCause cause) { | ||
| if(addCiMessage) { | ||
| cause.getMergeRequest().createCommitStatus(this.getDescriptor().getGitlab().instance(), "running", Jenkins.getInstance().getRootUrl() + run.getUrl()); | ||
| } | ||
| } | ||
|
|
||
| private String getSourceBranch(GitLabRequest req) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <div> | ||
| Enable GitLab 8.1 Continuous Integration feature. <b>DO NOT ENABLE IF YOU'RE USING A VERSION BEFORE GITLAB 8.1</b>. | ||
| </div> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to the commit status api documentation for the optional
refit saysBut here the commit id is assigned to it again.
Shouldn't it be
objectAttributes.getSourceBranch()?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@thommy101 can you comment on the above?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@EmteZogaf can you submit a PR for this so it doesn't get lost as just a comment on the source? Thanks!
EDIT: nevermind, you DID open one. Thanks :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@EmteZogaf @omehegan , I'm using the commit id as it's the closest I could find to match the default behavior of GitLab CI itself.
I haven't used the official CI myself (only using Java at the moment). I've looked at the blog post (https://about.gitlab.com/2015/09/22/gitlab-8-0-released/) and they are using the commit id.