From 7b8a85c0449e3723fa1164722d55355340ae183b Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 30 Oct 2015 20:03:26 +0100 Subject: [PATCH] Fix wrong URL being send to Gitlab Also a fix for MergeRequests containing source branch instead of commit hash --- .../dabsquared/gitlabjenkins/GitLabMergeRequest.java | 3 +-- .../dabsquared/gitlabjenkins/GitLabPushRequest.java | 2 +- .../dabsquared/gitlabjenkins/GitLabPushTrigger.java | 12 ++++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/dabsquared/gitlabjenkins/GitLabMergeRequest.java b/src/main/java/com/dabsquared/gitlabjenkins/GitLabMergeRequest.java index bf21296..2ad9274 100644 --- a/src/main/java/com/dabsquared/gitlabjenkins/GitLabMergeRequest.java +++ b/src/main/java/com/dabsquared/gitlabjenkins/GitLabMergeRequest.java @@ -65,9 +65,8 @@ public class GitLabMergeRequest extends GitLabRequest { public GitlabCommitStatus createCommitStatus(GitlabAPI api, String status, String targetUrl) { try { - GitlabMergeRequest mergeRequest = api.getMergeRequest(sourceProject, objectAttributes.getId()); if(objectAttributes.lastCommit!=null) { - return api.createCommitStatus(sourceProject, objectAttributes.getLastCommit().getId(), status, mergeRequest.getSourceBranch(), "Jenkins", targetUrl, null); + return api.createCommitStatus(sourceProject, objectAttributes.getLastCommit().getId(), status, objectAttributes.getLastCommit().getId(), "Jenkins", targetUrl, null); } } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushRequest.java b/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushRequest.java index 4d02aba..fbf2556 100644 --- a/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushRequest.java +++ b/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushRequest.java @@ -39,7 +39,7 @@ public class GitLabPushRequest extends GitLabRequest { public GitlabCommitStatus createCommitStatus(GitlabAPI api, String status, String targetUrl) { try { if(getLastCommit()!=null) { - return api.createCommitStatus(sourceProject, getLastCommit().getId(), status, checkout_sha, "Jenkins", targetUrl, null); + return api.createCommitStatus(sourceProject, checkout_sha, status, checkout_sha, "Jenkins", targetUrl, null); } } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java b/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java index 7de8164..9e10b10 100644 --- a/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java +++ b/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java @@ -207,7 +207,7 @@ public class GitLabPushTrigger extends Trigger> { } if(addCiMessage) { - req.createCommitStatus(getDescriptor().getGitlab().instance(), "pending", getDescriptor().gitlabHostUrl); + req.createCommitStatus(getDescriptor().getGitlab().instance(), "pending", Jenkins.getInstance().getRootUrl() + job.getUrl()); } } @@ -311,7 +311,7 @@ public class GitLabPushTrigger extends Trigger> { } if(addCiMessage) { - req.createCommitStatus(getDescriptor().getGitlab().instance(), "pending", getDescriptor().gitlabHostUrl); + req.createCommitStatus(getDescriptor().getGitlab().instance(), "pending", Jenkins.getInstance().getRootUrl() + job.getUrl()); } } @@ -411,7 +411,7 @@ public class GitLabPushTrigger extends Trigger> { private void onCompletedPushRequest(Run run, GitLabPushCause cause) { if(addCiMessage) { - cause.getPushRequest().createCommitStatus(this.getDescriptor().getGitlab().instance(), run.getResult()==Result.SUCCESS?"success":"failure", this.getDescriptor().gitlabHostUrl); + cause.getPushRequest().createCommitStatus(this.getDescriptor().getGitlab().instance(), run.getResult()==Result.SUCCESS?"success":"failure", Jenkins.getInstance().getRootUrl() + run.getUrl()); } } @@ -452,7 +452,7 @@ public class GitLabPushTrigger extends Trigger> { } if(addCiMessage) { - cause.getMergeRequest().createCommitStatus(this.getDescriptor().getGitlab().instance(), run.getResult()==Result.SUCCESS?"success":"failure", this.getDescriptor().gitlabHostUrl); + cause.getMergeRequest().createCommitStatus(this.getDescriptor().getGitlab().instance(), run.getResult()==Result.SUCCESS?"success":"failure", Jenkins.getInstance().getRootUrl() + run.getUrl()); } } @@ -472,13 +472,13 @@ public class GitLabPushTrigger extends Trigger> { private void onStartedPushRequest(Run run, GitLabPushCause cause) { if(addCiMessage) { - cause.getPushRequest().createCommitStatus(this.getDescriptor().getGitlab().instance(), "running", this.getDescriptor().gitlabHostUrl); + 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", this.getDescriptor().gitlabHostUrl); + cause.getMergeRequest().createCommitStatus(this.getDescriptor().getGitlab().instance(), "running", Jenkins.getInstance().getRootUrl() + run.getUrl()); } }