Skip to content

Send build completion notification for pull requests merged after build start #472

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

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Send build completion notification for pull requests merged after build start #472

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a88d25f
find SCMSource even if NullSCM now associated to build
mguillem Aug 18, 2021
1efe285
Merge branch 'master' into feature/push-notification-for-merged-pull-…
mguillem Sep 9, 2021
78188ba
Merge branch 'master' into feature/push-notification-for-merged-pull-…
mguillem Oct 22, 2021
da983b7
Merge branch 'master' into feature/push-notification-for-merged-pull-…
lifeofguenter Nov 14, 2021
9381971
Merge branch 'master' into feature/push-notification-for-merged-pull-…
mguillem Nov 15, 2021
ce2cdcd
Merge branch 'master' into feature/push-notification-for-merged-pull-…
lifeofguenter Nov 16, 2021
515413b
Merge branch 'master' into feature/push-notification-for-merged-pull-…
mguillem Nov 18, 2021
60d1ca7
Merge branch 'master' into feature/push-notification-for-merged-pull-…
mguillem Dec 10, 2021
e351ac0
Merge branch 'master' into feature/push-notification-for-merged-pull-…
lifeofguenter Jan 3, 2022
de063c2
Merge remote-tracking branch 'upstream/master' into
mguillem Jul 21, 2022
00ccdd6
Merge branch 'master' into feature/push-notification-for-merged-pull-…
lifeofguenter Jul 25, 2022
9a49a14
Merge branch 'master' into feature/push-notification-for-merged-pull-…
lifeofguenter Nov 3, 2023
3475390
Merge branch 'master' into feature/push-notification-for-merged-pull-…
lifeofguenter Nov 21, 2023
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
17 changes: 13 additions & 4 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 @@ -30,6 +30,7 @@
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.FilePath;
import hudson.model.ItemGroup;
import hudson.model.Result;
import hudson.model.Run;
import hudson.model.TaskListener;
Expand All @@ -48,6 +49,8 @@
import jenkins.scm.api.SCMRevision;
import jenkins.scm.api.SCMRevisionAction;
import jenkins.scm.api.SCMSource;
import jenkins.scm.api.SCMSourceOwner;
import jenkins.scm.impl.NullSCMSource;
import org.apache.commons.lang.StringUtils;
import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;

Expand Down Expand Up @@ -105,8 +108,8 @@ private static void createStatus(@NonNull Run<?, ?> build, @NonNull TaskListener
@NonNull BitbucketApi bitbucket, @NonNull String key, @NonNull String hash)
throws IOException, InterruptedException {

final SCMSource s = SCMSource.SourceByItem.findSource(build.getParent());
if (!(s instanceof BitbucketSCMSource)) {
final BitbucketSCMSource source = findBitbucketSCMSource(build);
if (source == null) {
return;
}

Expand Down Expand Up @@ -135,7 +138,6 @@ private static void createStatus(@NonNull Run<?, ?> build, @NonNull TaskListener
} else if (Result.UNSTABLE.equals(result)) {
statusDescription = StringUtils.defaultIfBlank(buildDescription, "This commit has test failures.");

BitbucketSCMSource source = (BitbucketSCMSource) s;
BitbucketSCMSourceContext sourceContext = new BitbucketSCMSourceContext(null, SCMHeadObserver.none())
.withTraits(source.getTraits());
if (sourceContext.sendSuccessNotificationForUnstableBuild()) {
Expand All @@ -160,12 +162,19 @@ private static void createStatus(@NonNull Run<?, ?> build, @NonNull TaskListener
status = new BitbucketBuildStatus(hash, statusDescription, state, url, key, name);
new BitbucketChangesetCommentNotifier(bitbucket).buildStatus(status);
if (result != null) {
listener.getLogger().println("[Bitbucket] Build result notified");
listener.getLogger().println("[Bitbucket] Build result notified: " + status.getState());
}
}

private static @CheckForNull BitbucketSCMSource findBitbucketSCMSource(Run<?, ?> build) {
SCMSource s = SCMSource.SourceByItem.findSource(build.getParent());
if (s instanceof NullSCMSource) {
// for instance PR merged on Bitbucket since the build has been started
ItemGroup<?> grandFather = build.getParent().getParent();
if (grandFather instanceof SCMSourceOwner) {
s = ((SCMSourceOwner) grandFather).getSCMSources().get(0);
Copy link
Contributor

@KalleOlaviNiemitalo KalleOlaviNiemitalo Aug 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If a Jenkins multibranch job has multiple SCM sources (e.g. an original repository and a fork with distinct branch names), I think this might not select the correct one.

Copy link
Contributor

@KalleOlaviNiemitalo KalleOlaviNiemitalo Aug 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the other hand, because this plugin is using the older REST API that does not distinguish between repositories, it will work anyway, as long as the repositories are on the same server.

Copy link
Contributor

@KalleOlaviNiemitalo KalleOlaviNiemitalo Aug 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But a similar fix might not be valid for jenkinsci/github-checks-plugin#196 because the GitHub API Create a check run is at POST /repos/{owner}/{repo}/check-runs and presumably has to be told the correct repository.

Copy link
Author

@mguillem mguillem Aug 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fix worked for me and was quite easy to implement. A solution to be really safe would be probably to save the url to which the INPROGRESS event has been sent to reuse it at build completion.

Copy link
Contributor

@KalleOlaviNiemitalo KalleOlaviNiemitalo Aug 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not only the URL but also the credential ID.

I think this change is fine for bitbucket-branch-source-plugin, but we need something more reliable for the equivalent issue in github-checks-plugin and in the future bitbucket-server-checks-plugin.

Copy link
Author

@mguillem mguillem Aug 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can someone say whether the proposed fix can be merged (and do it) or otherwise provide feedback about what should be changed? Thanks.

}
}
return s instanceof BitbucketSCMSource ? (BitbucketSCMSource) s : null;
}

Expand Down