Merge pull request #28 from Flagbit/fix-JENKINS-35083

Fix JENKINS-35083

Author: Antonio Mansilla

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java

@@ -133,14 +133,13 @@ public static List<BitbucketBuildStatusResource> createBuildStatusResources(fina
         Job<?, ?> project = build.getParent();
         List<BitbucketBuildStatusResource> buildStatusResources = new ArrayList<BitbucketBuildStatusResource>();
 
-        if(project instanceof WorkflowJob) {
+        if (project instanceof WorkflowJob) {
             Collection<? extends SCM> scms = ((WorkflowJob)project).getSCMs();
 
             for (SCM scm : scms) {
                 buildStatusResources.addAll(createBuildStatusResources(scm, build));
             }
-        }
-        else if(project instanceof AbstractProject) {
+        } else if (project instanceof AbstractProject) {
             SCM scm = ((AbstractProject)project).getScm();
             buildStatusResources = createBuildStatusResources(scm, build);
         }
@@ -153,11 +152,21 @@ public static String defaultBitbucketBuildKeyFromBuild(Run<?, ?> build) {
         return DigestUtils.md5Hex(project.getFullDisplayName() + "#" + build.getNumber());
     }
 
+    public static String uniqueBitbucketBuildKeyFromBuild(Run<?, ?> build) {
+        Job<?, ?> project = build.getParent();
+        return DigestUtils.md5Hex(project.getFullDisplayName());
+    }
+
     public static String defaultBitbucketBuildNameFromBuild(Run<?, ?> build) {
         Job<?, ?> project = build.getParent();
         return project.getFullDisplayName() + " #" + build.getNumber();
     }
 
+    public static String uniqueBitbucketBuildNameFromBuild(Run<?, ?> build) {
+        Job<?, ?> project = build.getParent();
+        return project.getFullDisplayName();
+    }
+
     public static String defaultBitbucketBuildDescriptionFromBuild(Run<?, ?> build) {
         AbstractTestResultAction testResult = build.getAction(AbstractTestResultAction.class);
         String description = "";
@@ -173,12 +182,19 @@ public static String buildUrlFromBuild(Run<?, ?> build) {
         return project.getAbsoluteUrl() + build.getNumber() + '/';
     }
 
-    private static BitbucketBuildStatus createBitbucketBuildStatusFromBuild(Run<?, ?> build) throws Exception {
+    private static BitbucketBuildStatus createBitbucketBuildStatusFromBuild(Run<?, ?> build, boolean overrideLatestBuild) throws Exception {
+        String buildKey = "";
+        String buildName = "";
         String buildState = guessBitbucketBuildState(build.getResult());
         // bitbucket requires the key to be shorter than 40 chars
-        String buildKey = defaultBitbucketBuildKeyFromBuild(build);
+        if (overrideLatestBuild) {
+            buildKey = uniqueBitbucketBuildKeyFromBuild(build);
+            buildName = uniqueBitbucketBuildNameFromBuild(build);
+        } else {
+            buildKey = defaultBitbucketBuildKeyFromBuild(build);
+            buildName = defaultBitbucketBuildNameFromBuild(build);
+        }
         String buildUrl = buildUrlFromBuild(build);
-        String buildName = defaultBitbucketBuildNameFromBuild(build);
         String description = defaultBitbucketBuildDescriptionFromBuild(build);
 
         return new BitbucketBuildStatus(buildState, buildKey, buildUrl, buildName, description);
@@ -196,20 +212,21 @@ private static String guessBitbucketBuildState(final Result result) {
         } else if (Result.UNSTABLE == result || Result.FAILURE == result || Result.ABORTED == result) {
             state = BitbucketBuildStatus.FAILED;
         } else {
-            // return empty status for every other result (NOT_BUILT, ABORTED)
+            // return empty status for every other result (NOT_BUILT)
             state = null;
         }
 
         return state;
     }
 
-    public static void notifyBuildStatus(UsernamePasswordCredentials credentials, final Run<?, ?> build,
-                                         final TaskListener listener) throws Exception {
-        notifyBuildStatus(credentials, build, listener, createBitbucketBuildStatusFromBuild(build));
+    public static void notifyBuildStatus(UsernamePasswordCredentials credentials, boolean overrideLatestBuild,
+                                         final Run<?, ?> build, final TaskListener listener) throws Exception {
+        notifyBuildStatus(credentials, overrideLatestBuild, build, listener, createBitbucketBuildStatusFromBuild(build, overrideLatestBuild));
     }
 
-    public static void notifyBuildStatus(UsernamePasswordCredentials credentials, final Run<?, ?> build,
-                                         final TaskListener listener, BitbucketBuildStatus buildStatus) throws Exception {
+    public static void notifyBuildStatus(UsernamePasswordCredentials credentials, boolean overrideLatestBuild,
+                                         final Run<?, ?> build, final TaskListener listener,
+                                         BitbucketBuildStatus buildStatus) throws Exception {
 
         List<BitbucketBuildStatusResource> buildStatusResources = createBuildStatusResources(build);
 
@@ -225,8 +242,9 @@ public static void notifyBuildStatus(UsernamePasswordCredentials credentials, fi
             // then update the bitbucket build status resource with current status and current build number
             for (BitbucketBuildStatusResource prevBuildStatusResource : prevBuildStatusResources) {
                 if (prevBuildStatusResource.getCommitId().equals(buildStatusResource.getCommitId())) {
-                    BitbucketBuildStatus prevBuildStatus = createBitbucketBuildStatusFromBuild(prevBuild);
+                    BitbucketBuildStatus prevBuildStatus = createBitbucketBuildStatusFromBuild(prevBuild, overrideLatestBuild);
                     buildStatus.setKey(prevBuildStatus.getKey());
+
                     break;
                 }
             }

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifier.java

@@ -58,14 +58,16 @@ public class BitbucketBuildStatusNotifier extends Notifier {
 
     private boolean notifyStart;
     private boolean notifyFinish;
+    private boolean overrideLatestBuild;
     private String credentialsId;
 
     @DataBoundConstructor
     public BitbucketBuildStatusNotifier(final boolean notifyStart, final boolean notifyFinish,
-                                        final String credentialsId) {
+                                        final boolean overrideLatestBuild, final String credentialsId) {
         super();
         this.notifyStart = notifyStart;
         this.notifyFinish = notifyFinish;
+        this.overrideLatestBuild = overrideLatestBuild;
         this.credentialsId = credentialsId;
     }
 
@@ -77,6 +79,10 @@ public boolean getNotifyFinish() {
         return this.notifyFinish;
     }
 
+    public boolean getOverrideLatestBuild() {
+        return this.overrideLatestBuild;
+    }
+
     public String getCredentialsId() {
         return this.credentialsId != null ? this.credentialsId : this.getDescriptor().getGlobalCredentialsId();
     }
@@ -100,7 +106,7 @@ public boolean prebuild(AbstractBuild<?, ?> build, BuildListener listener) {
         logger.info("Bitbucket notify on start");
 
         try {
-            BitbucketBuildStatusHelper.notifyBuildStatus(this.getCredentials(build), build, listener);
+            BitbucketBuildStatusHelper.notifyBuildStatus(this.getCredentials(build), this.getOverrideLatestBuild(), build, listener);
         } catch (Exception e) {
             listener.getLogger().println("Bitbucket notify on start failed: " + e.getMessage());
             e.printStackTrace(listener.getLogger());
@@ -120,7 +126,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         logger.info("Bitbucket notify on finish");
 
         try {
-            BitbucketBuildStatusHelper.notifyBuildStatus(this.getCredentials(build), build, listener);
+            BitbucketBuildStatusHelper.notifyBuildStatus(this.getCredentials(build), this.getOverrideLatestBuild(), build, listener);
         } catch (Exception e) {
             logger.log(Level.INFO, "Bitbucket notify on finish failed: " + e.getMessage(), e);
             listener.getLogger().println("Bitbucket notify on finish failed: " + e.getMessage());

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java

@@ -186,7 +186,7 @@ public Void run() throws Exception {
             BitbucketBuildStatus buildStatus = new BitbucketBuildStatus(buildState, buildKey, buildUrl, buildName,
                     buildDescription);
 
-            BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), build, taskListener, buildStatus);
+            BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), false, build, taskListener, buildStatus);
 
             if(buildState.equals(BitbucketBuildStatus.FAILED)) {
                 throw new Exception(buildDescription);

src/main/resources/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifier/config.jelly

@@ -6,6 +6,9 @@
     <f:entry title="${%Notify build finish}" field="notifyFinish">
         <f:checkbox />
     </f:entry>
+    <f:entry title="${%Only show latest build status}" field="overrideLatestBuild">
+        <f:checkbox />
+    </f:entry>
     <f:advanced>
         <f:entry title="${%Credentials}" field="credentialsId">
             <c:select />