From 620a2215e275e124836327ba1e6a153d07615af2 Mon Sep 17 00:00:00 2001 From: Björn Dahlgren Date: Thu, 26 Nov 2015 17:27:10 +0100 Subject: Use new Build Status instead of commenting on pull requests News: http://blog.bitbucket.org/2015/11/18/introducing-the-build-status-api-for-bitbucket-cloud/ API: https://confluence.atlassian.com/bitbucket/buildstatus-resource-779295267.html --- .../bitbucketpullrequestbuilder/BitbucketBuilds.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuilds.java') diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuilds.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuilds.java index 45e1873..3e8e84b 100644 --- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuilds.java +++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuilds.java @@ -1,5 +1,6 @@ package bitbucketpullrequestbuilder.bitbucketpullrequestbuilder; +import bitbucketpullrequestbuilder.bitbucketpullrequestbuilder.bitbucket.BuildState; import hudson.model.AbstractBuild; import hudson.model.Cause; import hudson.model.Result; @@ -51,13 +52,13 @@ public class BitbucketBuilds { String rootUrl = Jenkins.getInstance().getRootUrl(); String buildUrl = ""; if (rootUrl == null) { - buildUrl = " PLEASE SET JENKINS ROOT URL FROM GLOBAL CONFIGURATION " + build.getUrl(); - } - else { + logger.warning("PLEASE SET JENKINS ROOT URL IN GLOBAL CONFIGURATION FOR BUILD STATE REPORTING"); + } else { buildUrl = rootUrl + build.getUrl(); + BuildState state = result == Result.SUCCESS ? BuildState.SUCCESSFUL : BuildState.FAILED; + repository.setBuildStatus(cause, state, buildUrl); } - repository.deletePullRequestComment(cause.getPullRequestId(), cause.getBuildStartCommentId()); - repository.postFinishedComment(cause.getPullRequestId(), cause.getSourceCommitHash(), cause.getDestinationCommitHash(), result == Result.SUCCESS, buildUrl); + if ( this.trigger.getApproveIfSuccess() && result == Result.SUCCESS ) { this.repository.postPullRequestApproval(cause.getPullRequestId()); } -- cgit v1.2.3