Merge branch 'master' into JENKINS-49902-fix-extract-bitbucket-repository-name-from-repo-URI

Author: Antonio Mansilla

.gitignore

@@ -1,2 +1,3 @@
 /target/
 *.iml
+.idea/

Jenkinsfile

@@ -0,0 +1,4 @@
+#!groovy
+
+buildPlugin()
+

README.md

@@ -100,42 +100,54 @@ If `buildKey` and `buildName` parameters are not provided, a standard name will
     bitbucketStatusNotify(
       buildState: 'INPROGRESS',
       buildKey: 'build',
-      buildName: 'Build'
+      buildName: 'Build',
+      repoSlug: 'my-awesome-project',
+      commitId: 'a83c709e9d514421ef614ef0a1117366c84c6304'      
     )
     try {
         myBuildFunction()
         bitbucketStatusNotify(
           buildState: 'SUCCESSFUL',
           buildKey: 'build',
-          buildName: 'Build'
+          buildName: 'Build',
+          repoSlug: 'my-awesome-project',
+          commitId: 'a83c709e9d514421ef614ef0a1117366c84c6304'          
         )
     } catch(Exception e) {
         bitbucketStatusNotify(
           buildState: 'FAILED',
           buildKey: 'build',
           buildName: 'Build',
-          buildDescription: 'Something went wrong with build!'
+          buildDescription: 'Something went wrong with build!',
+          repoSlug: 'my-awesome-project',
+          commitId: 'a83c709e9d514421ef614ef0a1117366c84c6304'      
         )
     }
   stage 'Test'
     bitbucketStatusNotify(
       buildState: 'INPROGRESS',
       buildKey: 'test',
-      buildName: 'Test'
+      buildName: 'Test',
+      repoSlug: 'my-awesome-project',
+      commitId: 'a83c709e9d514421ef614ef0a1117366c84c6304'
     )
     try {
         myTestFunction()
         bitbucketStatusNotify(
           buildState: 'SUCCESSFUL',
           buildKey: 'test',
-          buildName: 'Test'
+          buildName: 'Test',
+          repoSlug: 'my-awesome-project',
+          commitId: 'a83c709e9d514421ef614ef0a1117366c84c6304'
         )
     } catch(Exception e) {
         bitbucketStatusNotify(
           buildState: 'FAILED',
           buildKey: 'test',
           buildName: 'Test',
-          buildDescription: 'Something went wrong with tests!'
+          buildDescription: 'Something went wrong with tests!',
+          repoSlug: 'my-awesome-project',
+          commitId: 'a83c709e9d514421ef614ef0a1117366c84c6304'
         )
     }
   ...
@@ -151,6 +163,10 @@ Parameter:
 | `buildKey` | String | yes | The unique key identifying the current build phase
 | `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 
+
+Note that the `repoSlug` and `commitId` parameters work only when they are both specified.
 
 ## Contributions
 
@@ -175,6 +191,6 @@ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEM
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-[jenkins-builds]: https://jenkins.ci.cloudbees.com/job/plugins/job/bitbucket-build-status-notifier-plugin/
-[jenkins-status]: https://jenkins.ci.cloudbees.com/buildStatus/icon?job=plugins/bitbucket-build-status-notifier-plugin
+[jenkins-builds]: https://ci.jenkins.io/job/plugins/job/bitbucket-build-status-notifier-plugin/job/master
+[jenkins-status]: https://ci.jenkins.io/buildStatus/icon?job=plugins/bitbucket-build-status-notifier-plugin/master
 [how-to-submit-issue]: https://wiki.jenkins-ci.org/display/JENKINS/How+to+report+an+issue

pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>bitbucket-build-status-notifier</artifactId>
-  <version>1.3.4-SNAPSHOT</version>
+  <version>1.4.1-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <properties>

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

@@ -225,12 +225,12 @@ private static String guessBitbucketBuildState(final Result result) {
 
     public static void notifyBuildStatus(UsernamePasswordCredentials credentials, boolean overrideLatestBuild,
                                          final Run<?, ?> build, final TaskListener listener) throws Exception {
-        notifyBuildStatus(credentials, overrideLatestBuild, build, listener, createBitbucketBuildStatusFromBuild(build, overrideLatestBuild));
+        notifyBuildStatus(credentials, overrideLatestBuild, build, listener, createBitbucketBuildStatusFromBuild(build, overrideLatestBuild), null, null);
     }
 
     public static void notifyBuildStatus(UsernamePasswordCredentials credentials, boolean overrideLatestBuild,
                                          final Run<?, ?> build, final TaskListener listener,
-                                         BitbucketBuildStatus buildStatus) throws Exception {
+                                         BitbucketBuildStatus buildStatus, String repoSlug, String commitId) throws Exception {
 
         List<BitbucketBuildStatusResource> buildStatusResources = createBuildStatusResources(build);
 
@@ -253,6 +253,10 @@ public static void notifyBuildStatus(UsernamePasswordCredentials credentials, bo
                 }
             }
 
+            if(repoSlug != null && commitId != null) {
+                buildStatusResource = new BitbucketBuildStatusResource(buildStatusResource.getOwner(), repoSlug, commitId);
+            }
+
             sendBuildStatusNotification(credentials, build, buildStatusResource, buildStatus, listener);
         }
     }

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

@@ -105,6 +105,7 @@ public boolean prebuild(AbstractBuild<?, ?> build, BuildListener listener) {
         }
         logger.info("Bitbucket notify on start");
 
+
         try {
             BitbucketBuildStatusHelper.notifyBuildStatus(this.getCredentials(build), this.getOverrideLatestBuild(), build, listener);
         } catch (Exception e) {

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

@@ -83,6 +83,18 @@ public String getCredentialsId() {
     private String buildState;
     public String getBuildState() { return this.buildState; }
 
+    private String repoSlug;
+    public String getRepoSlug() { return this.repoSlug; }
+    @DataBoundSetter public void setRepoSlug(String repoSlug) {
+        this.repoSlug = repoSlug;
+    }
+
+    private String commitId;
+    public String getCommitId() { return this.commitId; }
+    @DataBoundSetter public void setCommitId(String commitId) {
+        this.commitId = commitId;
+    }
+
     @DataBoundConstructor
     public BitbucketBuildStatusNotifierStep(final String buildState) {
         this.credentialsId = credentialsId;
@@ -181,12 +193,17 @@ public Void run() throws Exception {
                 buildDescription = BitbucketBuildStatusHelper.defaultBitbucketBuildDescriptionFromBuild(build);
             }
 
+            String commitId = step.getCommitId();
+            String repoSlug = step.getRepoSlug();
+            logger.info("Got commit id " + commitId);
+            logger.info("Got repo slug = " + repoSlug);
+
             String buildUrl = BitbucketBuildStatusHelper.buildUrlFromBuild(build);
 
             BitbucketBuildStatus buildStatus = new BitbucketBuildStatus(buildState, buildKey, buildUrl, buildName,
                     buildDescription);
 
-            BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), false, build, taskListener, buildStatus);
+            BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), false, build, taskListener, buildStatus, repoSlug, commitId);
 
             return null;
         }