Skip to content

Use unified build status key with exclude origin PR Branches strategy #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jetersen merged 6 commits into from
Apr 7, 2019
Merged

Use unified build status key with exclude origin PR Branches strategy #172

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fcccf0
Use unified build status key when ExcludeOriginPRBranchesSCMHeadFilte…
JeanChristopheMorinPerso Feb 23, 2019
7c32fbe
Review suggestion
jetersen Feb 23, 2019
7f5c11e
fix import
jetersen Feb 24, 2019
ab31422
move code around
jetersen Apr 7, 2019
f71e6bb
shush codacy
jetersen Apr 7, 2019
9083fd0
withTraits once
jetersen Apr 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 39 additions & 8 deletions src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketBuildStatusNotifications.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/
package com.cloudbees.jenkins.plugins.bitbucket;

import com.cloudbees.jenkins.plugins.bitbucket.BranchDiscoveryTrait.ExcludeOriginPRBranchesSCMHeadFilter;
import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketApi;
import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketBuildStatus;
import com.cloudbees.jenkins.plugins.bitbucket.client.BitbucketCloudApiClient;
Expand Down Expand Up @@ -93,7 +94,7 @@ static String checkURL(@NonNull String url) {
}

private static void createStatus(@NonNull Run<?, ?> build, @NonNull TaskListener listener,
@NonNull BitbucketApi bitbucket, @NonNull String hash)
@NonNull BitbucketApi bitbucket, @NonNull String key, @NonNull String hash)
throws IOException, InterruptedException {

String url;
Expand All @@ -107,7 +108,6 @@ private static void createStatus(@NonNull Run<?, ?> build, @NonNull TaskListener
return;
}

String key = build.getParent().getFullName(); // use the job full name as the key for the status
String name = build.getFullDisplayName(); // use the build number as the display name of the status
BitbucketBuildStatus status;
Result result = build.getResult();
Expand Down Expand Up @@ -148,24 +148,36 @@ private static void sendNotifications(Run<?, ?> build, TaskListener listener)
return;
}
BitbucketSCMSource source = (BitbucketSCMSource) s;
if (new BitbucketSCMSourceContext(null, SCMHeadObserver.none())
.withTraits(source.getTraits())
.notificationsDisabled()) {
BitbucketSCMSourceContext sourceContext = new BitbucketSCMSourceContext(null,
SCMHeadObserver.none()).withTraits(source.getTraits());
if (sourceContext.notificationsDisabled()) {
return;
}
SCMRevision r = SCMRevisionAction.getRevision(s, build);
if (r == null) {
return;
}
String hash = getHash(r);
if (hash == null) {
return;
}
boolean shareBuildKeyBetweenBranchAndPR = sourceContext
.filters().stream()
.anyMatch(filter -> filter instanceof ExcludeOriginPRBranchesSCMHeadFilter);

String key;
BitbucketApi bitbucket;
if (r instanceof PullRequestSCMRevision) {
listener.getLogger().println("[Bitbucket] Notifying pull request build result");
createStatus(build, listener, source.buildBitbucketClient((PullRequestSCMHead) r.getHead()), hash);

PullRequestSCMHead head = (PullRequestSCMHead) r.getHead();
key = getBuildKey(build, head.getOriginName(), shareBuildKeyBetweenBranchAndPR);
bitbucket = source.buildBitbucketClient(head);
} else {
listener.getLogger().println("[Bitbucket] Notifying commit build result");
createStatus(build, listener, source.buildBitbucketClient(), hash);
key = getBuildKey(build, r.getHead().getName(), shareBuildKeyBetweenBranchAndPR);
bitbucket = source.buildBitbucketClient();
}
createStatus(build, listener, bitbucket, key, hash);
}

@CheckForNull
Expand All @@ -184,6 +196,25 @@ private static String getHash(@CheckForNull SCMRevision revision) {
return null;
}

private static String getBuildKey(@NonNull Run<?, ?> build, String branch,
boolean shareBuildKeyBetweenBranchAndPR) {

// When the ExcludeOriginPRBranchesSCMHeadFilter filter is active, we want the
// build status key to be the same between the branch project and the PR project.
// This is to avoid having two build statuses when a branch goes into PR and
// it was already built at least once as a branch.
// So the key we use is the branch name.
String key;
if (shareBuildKeyBetweenBranchAndPR) {
String folderName = build.getParent().getParent().getFullName();
key = String.format("%s/%s", folderName, branch);
} else {
key = build.getParent().getFullName(); // use the job full name as the key for the status
}

return key;
}

/**
* Sends notifications to Bitbucket on Checkout (for the "In Progress" Status).
*/
Expand Down