From a249fde9418c0257ebf117a4e0cf1d7a6a0bcfef Mon Sep 17 00:00:00 2001 From: Aaron Axisa Date: Wed, 22 Jun 2022 10:52:22 +0200 Subject: [PATCH 1/2] JENKINS-35083 Adding option to override latest build for pipeline runs. --- .../bitbucket/BitbucketBuildStatusNotifierStep.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java index 62f5c71..9ce3cd9 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java @@ -92,6 +92,14 @@ public class BitbucketBuildStatusNotifierStep extends AbstractStepImpl { this.commitId = commitId; } + private String overrideLatestBuild; + public Boolean getOverrideLatestBuildOrDefault() { + return Boolean.valueOf(this.overrideLatestBuild); + } + @DataBoundSetter public void setOverrideLatestBuild(String overrideLatestBuild) { + this.overrideLatestBuild = overrideLatestBuild; + } + @DataBoundConstructor public BitbucketBuildStatusNotifierStep(final String buildState) { this.buildState = buildState; @@ -199,7 +207,7 @@ public Void run() throws Exception { BitbucketBuildStatus buildStatus = new BitbucketBuildStatus(buildState, buildKey, buildUrl, buildName, buildDescription); - BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), false, build, taskListener, buildStatus, repoSlug, commitId); + BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), step.getOverrideLatestBuildOrDefault(), build, taskListener, buildStatus, repoSlug, commitId); return null; } From fe9a37d20a671b4f0b6398dfd3196a01b8839af7 Mon Sep 17 00:00:00 2001 From: Aaron Axisa Date: Wed, 22 Jun 2022 10:57:07 +0200 Subject: [PATCH 2/2] JENKINS-35083 Adding option to override latest build for pipeline runs in doc --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 85ae076..89fe6cf 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,8 @@ Parameter: | `buildName` | String | yes | The build phase's name shown on BitBucket | `buildDescription` | String | yes | The build phase's description shown on BitBucket | `repoSlug`| String | yes | The slug of the bitbucket repository to send the notification to -| `commitId` | String | yes | The id of the commit to attach the status notification to +| `commitId` | String | yes | The id of the commit to attach the status notification to +| `overrideLatestBuild` | String | yes | If set to `true` will override the last build on Bitbucket (useful for requiring successful builds on pr merge). Defaults to false. Note that the `repoSlug` and `commitId` parameters work only when they are both specified.