[JENKINS-75203] Include parent in build status notification

Author: ugrave

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/BitbucketBuildStatus.java

@@ -81,6 +81,11 @@ public String toString() {
      */
     private String key;
 
+    /**
+     * The parent key
+     */
+    private String parent;
+
     /**
      * A short name, usually #job-name, #build-number (will be shown as link
      * text in BB UI)
@@ -136,6 +141,7 @@ public BitbucketBuildStatus(@NonNull BitbucketBuildStatus other) {
         this.name = other.name;
         this.refname = other.refname;
         this.buildDuration = other.buildDuration;
+        this.parent = other.parent;
     }
 
     public String getHash() {
@@ -210,4 +216,11 @@ public void setBuildNumber(int buildNumber) {
         this.buildNumber = buildNumber;
     }
 
+    public void setParent(String parent) {
+        this.parent = parent;
+    }
+
+    public String getParent() {
+        return parent;
+    }
 }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/notifier/BitbucketBuildStatusNotifications.java

@@ -177,12 +177,15 @@ private static void createStatus(@NonNull Run<?, ?> build,
         if (state != null) {
             BitbucketDefaulNotifier notifier = new BitbucketDefaulNotifier(client);
             String notificationKey = DigestUtils.md5Hex(key);
+            String notificationParentKey = null;
             if (context.useReadableNotificationIds() && !isCloud) {
                 notificationKey = key.replace(' ', '_').toUpperCase();
+                notificationParentKey = getBuildParentKey(build).replace(' ', '_').toUpperCase();
             }
             BitbucketBuildStatus buildStatus = new BitbucketBuildStatus(hash, statusDescription, state, url, notificationKey, name, refName);
             buildStatus.setBuildDuration(build.getDuration());
             buildStatus.setBuildNumber(build.getNumber());
+            buildStatus.setParent(notificationParentKey);
             // TODO testResults should be provided by an extension point that integrates JUnit or anything else plugin
             notifier.notifyBuildStatus(buildStatus);
             if (result != null) {
@@ -296,6 +299,10 @@ private static String getBuildKey(@NonNull Run<?, ?> build, String branch, boole
         return key;
     }
 
+    private static String getBuildParentKey(@NonNull Run<?, ?> build) {
+        return build.getParent().getParent().getFullName();
+    }
+
     /**
      * Sends notifications to Bitbucket on Checkout (for the "In Progress" Status).
      */

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/impl/notifier/BitbucketBuildStatusNotificationsJUnit5Test.java

@@ -140,6 +140,35 @@ void test_status_notification_name_when_UseReadableNotificationIds_is_true(@NonN
         ArgumentCaptor<BitbucketBuildStatus> captor = ArgumentCaptor.forClass(BitbucketBuildStatus.class);
         verify(apiClient).postBuildStatus(captor.capture());
         assertThat(captor.getValue().getKey()).isEqualTo("P/BRANCH-JOB");
+        assertThat(captor.getValue().getParent()).isEqualTo("P");
+    }
+
+    @Issue("JENKINS-75203")
+    @Test
+    void test_status_notification_parent_key_null_if_cloud_is_true(@NonNull JenkinsRule r) throws Exception {
+        StreamBuildListener taskListener = new StreamBuildListener(System.out, StandardCharsets.UTF_8);
+        URL jenkinsURL = new URL("http://example.com:" + r.getURL().getPort() + r.contextPath + "/");
+        JenkinsLocationConfiguration.get().setUrl(jenkinsURL.toString());
+
+        String serverURL = BitbucketCloudEndpoint.SERVER_URL;
+
+        BitbucketBuildStatusNotificationsTrait trait = new BitbucketBuildStatusNotificationsTrait();
+
+        WorkflowRun build = prepareBuildForNotification(r, trait, serverURL);
+        doReturn(Result.SUCCESS).when(build).getResult();
+
+        FilePath workspace = r.jenkins.getWorkspaceFor(build.getParent());
+
+        BitbucketApi apiClient = mock(BitbucketCloudApiClient.class);
+        BitbucketMockApiFactory.add(serverURL, apiClient);
+
+        JobCheckoutListener listener = new JobCheckoutListener();
+        listener.onCheckout(build, null, workspace, taskListener, null, SCMRevisionState.NONE);
+
+        ArgumentCaptor<BitbucketBuildStatus> captor = ArgumentCaptor.forClass(BitbucketBuildStatus.class);
+        verify(apiClient).postBuildStatus(captor.capture());
+        assertThat(captor.getValue().getKey()).isNotEmpty();
+        assertThat(captor.getValue().getParent()).isNull();
     }
 
     @Issue("JENKINS-74970")
@@ -173,6 +202,7 @@ void test_status_notification_on_fork(@NonNull JenkinsRule r) throws Exception {
         assertThat(captor.getValue()).satisfies(status -> {
             assertThat(status.getHash()).isEqualTo(prRevision.getHash());
             assertThat(status.getKey()).isEqualTo(DigestUtils.md5Hex("p/branch-job"));
+            assertThat(status.getParent()).isNull();
             assertThat(status.getRefname()).isEqualTo("refs/heads/" + scmHead.getBranchName());
         });
     }