aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrode Aannevik <frode.aa@gmail.com>2017-02-12 17:05:15 +0100
committerFrode Aannevik <frode.aannevik@bambora.com>2017-02-20 00:19:30 +0100
commit0debdfbdf1846f74928e0c4e932475b77e655a06 (patch)
tree0dffac3389f7571da134c4dc64bca749eae35bfb
parent066fc6386f08729ac2861e29b4bba91427541724 (diff)
downloadbbprb-0debdfbdf1846f74928e0c4e932475b77e655a06.tar.gz
Fix PR build status and update of job description
BitbucketBuildListener was not invoked on pipeline jobs Change BitbucketBuildListener to extend from RunListener<Run<?, ?>> so it will invoked to update job description and PR build result
-rw-r--r--src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildListener.java48
-rw-r--r--src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuilds.java25
2 files changed, 40 insertions, 33 deletions
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildListener.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildListener.java
index 95931ad..9e067e7 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildListener.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildListener.java
@@ -2,8 +2,12 @@ package bitbucketpullrequestbuilder.bitbucketpullrequestbuilder;
import hudson.Extension;
import hudson.model.AbstractBuild;
+import hudson.model.Job;
+import hudson.model.Run;
import hudson.model.TaskListener;
import hudson.model.listeners.RunListener;
+import hudson.triggers.Trigger;
+import jenkins.model.ParameterizedJobMixIn;
import javax.annotation.Nonnull;
import java.util.logging.Logger;
@@ -12,25 +16,43 @@ import java.util.logging.Logger;
* Created by nishio
*/
@Extension
-public class BitbucketBuildListener extends RunListener<AbstractBuild> {
- private static final Logger logger = Logger.getLogger(BitbucketBuildTrigger.class.getName());
+public class BitbucketBuildListener extends RunListener<Run<?, ?>> {
+ private static final Logger logger = Logger.getLogger(BitbucketBuildListener.class.getName());
@Override
- public void onStarted(AbstractBuild abstractBuild, TaskListener listener) {
- logger.info("BuildListener onStarted called.");
- BitbucketBuildTrigger trigger = BitbucketBuildTrigger.getTrigger(abstractBuild.getProject());
- if (trigger == null) {
- return;
+ public void onStarted(Run r, TaskListener listener) {
+ logger.info("BitbucketBuildListener onStarted called.");
+ BitbucketBuilds builds = builds(r);
+ if (builds != null) {
+ builds.onStarted((BitbucketCause) r.getCause(BitbucketCause.class), r);
}
- trigger.getBuilder().getBuilds().onStarted(abstractBuild);
}
@Override
- public void onCompleted(AbstractBuild abstractBuild, @Nonnull TaskListener listener) {
- BitbucketBuildTrigger trigger = BitbucketBuildTrigger.getTrigger(abstractBuild.getProject());
- if (trigger == null) {
- return;
+ public void onCompleted(Run r, @Nonnull TaskListener listener) {
+ logger.info("BitbucketBuildListener onCompleted called.");
+ BitbucketBuilds builds = builds(r);
+ if (builds != null) {
+ builds.onCompleted((BitbucketCause) r.getCause(BitbucketCause.class), r.getResult(), r.getUrl());
}
- trigger.getBuilder().getBuilds().onCompleted(abstractBuild);
}
+
+ private BitbucketBuilds builds(Run<?, ?> r) {
+ BitbucketBuildTrigger trigger = null;
+ if (r instanceof AbstractBuild) {
+ trigger = BitbucketBuildTrigger.getTrigger(((AbstractBuild) r).getProject());
+ } else {
+ Job job = r.getParent();
+ if (job instanceof ParameterizedJobMixIn.ParameterizedJob) {
+
+ for (Trigger<?> t : ((ParameterizedJobMixIn.ParameterizedJob) job).getTriggers().values()) {
+ if (t instanceof BitbucketBuildTrigger) {
+ trigger = (BitbucketBuildTrigger) t;
+ }
+ }
+ }
+ }
+ return trigger == null ? null : trigger.getBuilder().getBuilds();
+ }
+
}
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuilds.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuilds.java
index ea8e892..216287d 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuilds.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuilds.java
@@ -1,10 +1,7 @@
package bitbucketpullrequestbuilder.bitbucketpullrequestbuilder;
import bitbucketpullrequestbuilder.bitbucketpullrequestbuilder.bitbucket.BuildState;
-import hudson.model.AbstractBuild;
-import hudson.model.Cause;
-import hudson.model.Result;
-import jenkins.model.Jenkins;
+import hudson.model.*;
import jenkins.model.JenkinsLocationConfiguration;
import java.io.IOException;
@@ -24,16 +21,7 @@ public class BitbucketBuilds {
this.repository = repository;
}
- public BitbucketCause getCause(AbstractBuild build) {
- Cause cause = build.getCause(BitbucketCause.class);
- if (cause == null || !(cause instanceof BitbucketCause)) {
- return null;
- }
- return (BitbucketCause) cause;
- }
-
- public void onStarted(AbstractBuild build) {
- BitbucketCause cause = this.getCause(build);
+ void onStarted(BitbucketCause cause, Run<?, ?> build) {
if (cause == null) {
return;
}
@@ -44,24 +32,21 @@ public class BitbucketBuilds {
}
}
- public void onCompleted(AbstractBuild build) {
- BitbucketCause cause = this.getCause(build);
+ void onCompleted(BitbucketCause cause, Result result, String buildUrl) {
if (cause == null) {
return;
}
- Result result = build.getResult();
JenkinsLocationConfiguration globalConfig = new JenkinsLocationConfiguration();
String rootUrl = globalConfig.getUrl();
- String buildUrl = "";
if (rootUrl == null) {
logger.warning("PLEASE SET JENKINS ROOT URL IN GLOBAL CONFIGURATION FOR BUILD STATE REPORTING");
} else {
- buildUrl = rootUrl + build.getUrl();
+ buildUrl = rootUrl + buildUrl;
BuildState state = result == Result.SUCCESS ? BuildState.SUCCESSFUL : BuildState.FAILED;
repository.setBuildStatus(cause, state, buildUrl);
}
- if ( this.trigger.getApproveIfSuccess() && result == Result.SUCCESS ) {
+ if (this.trigger.getApproveIfSuccess() && result == Result.SUCCESS) {
this.repository.postPullRequestApproval(cause.getPullRequestId());
}
}