[JENKINS-33507] Add support for the Bitbucket server. #5

Eernie · 2016-06-19T22:26:33Z

I made some changes to the code to enable more support for Bitbucket server.
I also made a plugin for Bitbucket which is currently submitted for approval. When both installed Bitbucket can successfully send events to the jenkins machine.

See bitbucket-webhooks-plugin repo for more information about the Bitbucket plugin.
The plugin is also accepted by atlassian.

@reviewbybees

This commit serves to be able to use this plugin with the Bitbucket server instance. I'm also creating an plugin for Bitbucket server for this to work. This will send ( just like the cloud ) events when a PR is created/updated and when a push is done. This way we can use the same functionality for both Cloud and Server.

ghost · 2016-06-20T21:18:45Z

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

tiny-dancer · 2016-06-21T00:44:09Z

+1

Jurrie · 2016-06-23T08:53:41Z

+1

amuniz · 2016-07-02T18:11:18Z

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

+ * Represents a push event coming from Bitbucket (webhooks).
+ */
+public interface BitbucketPushEvent
+{


Please, follow the current code style in the rest of the code base.

amuniz · 2016-07-02T18:15:59Z

Looks good in general, and I like the idea to use an OSS plugin at Bitbucket side also, thanks for it.

I didn't have time to test it locally, but I want to do it. In the meantime, please fix the code style comments and merge with master (there are conflicts now).

…-plugin into feature/moreSupportForBBServer # Conflicts: # src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/BitbucketSCMSourcePushHookReceiver.java

Eernie · 2016-07-02T22:42:15Z

@amuniz Thanks for the review, I've resolved the conflict and fixed the code style.

tiny-dancer · 2016-07-09T18:48:09Z

;)

nickbroon · 2016-07-20T15:48:31Z

Is this now suitable for merging?

jreijn · 2016-07-22T12:58:35Z

I've tested the PR locally in combination with https://marketplace.atlassian.com/plugins/nl.topicus.bitbucket.bitbucket-webhooks/server/overview . Works like a charm.

Jurrie · 2016-07-29T06:23:07Z

@amuniz Can this PR be merged now? It seems your comments are processed.

Eernie · 2016-08-01T12:56:53Z

@amuniz Had any time to test this lately? I think a lot of people are waiting on a new release with this. :)

bhat-man · 2016-08-25T16:37:43Z

Please merge this. We just purchased a license of Cloudbees and can't do what we want without this.

FYI, I built and installed the plugin from snapshot and it doesn't appear to be working. I am using BitBucket Server version 4.5.2 and CloudBees version "Jenkins ver. 1.642.18.2 (CloudBees Jenkins Enterprise 15.11)" I am using the Webhook to Jenkins for Bitbucket plugin in BitBucket (https://marketplace.atlassian.com/plugins/com.nerdwin15.stash-stash-webhook-jenkins/server/overview)

amuniz · 2016-08-26T11:01:34Z

@bhat-man the plugin this PR is developed against is this. I think you are using another one.

bhat-man · 2016-08-26T14:49:24Z

I did try that one as well and had similar issues. I will build a fresh Jenkins server and test again. Is this the correct endpoint to use:

/bitbucket-scmsource-hook/notify

EDIT: Realized I was building the plugin off of master instead of the feature branch. After building from the correct branch I confirmed this is working as expected.

Mktmac · 2016-09-12T15:18:26Z

Hi guys,

I was wondering if there's a timetable for the merge of this PR? I saw that everything seems to be working fine.

Thanks,
Dnaiel

markottaviani · 2016-09-12T20:18:09Z

Another Cloudbees customer here, very interested in seeing this get merged if all concerns have been satisfied. Big thinks to @Eernie for putting this together.

aheritier · 2016-09-12T21:32:50Z

I will try to escalate it internally but I don't expect to have some help this week with Jenkins World. But if some of you are going to JW, don't hesitate to kidnapp @amuniz up until it reviews/merge/release it :-P

Eernie · 2016-09-13T06:49:16Z

@aheritier Thanks for that, I'm hoping the list of PR's can be merged and released quickly. 👍

amuniz · 2016-09-13T18:21:40Z

@aheritier with friends like you I prefer enemies 😛
This is going to be merged in a few days (I need to test it against a BB Server, which will take me some time).

BTW we need a way to test this kind of changes ideally without the need of a running BB Server, if someone come up with a solution for that, it would be more than welcome!! (maybe an embedded dumb JSON server returning static files suffice, TBD).

aheritier · 2016-09-13T18:52:52Z

@amuniz 😗 ❤️ I love you too

zackpollard · 2016-09-15T10:13:57Z

Glad to hear this should be merged soon, was trying to use the auto webhook feature earlier today to find out it can only be used with bitbucket cloud! Good work all :)

zackpollard · 2016-09-15T12:22:31Z

@Eernie Is there any reason that this needs to use your own plugin for bitbucket? Could it not use the more widely used (and so more likely to be installed on an enterprise bitbucket) plugin found here https://marketplace.atlassian.com/plugins/com.atlassian.stash.plugin.stash-web-post-receive-hooks-plugin/server/overview

Eernie · 2016-09-15T20:38:48Z

@zackpollard I've tried that first. But after implementing that version I noticed that you're limited to 5 Calls per repo and you're limited to pushes only. The hook wouldn't get triggered when making a pull request.
And implementing the "auto register" function would be imposible.

zackpollard · 2016-09-15T20:40:59Z

I believe that the pull request thing is actually a bug in the more recent versions of bitbucket. As for auto registering that would be possible as you can do it through the API, I have done this for another automated setup we are currently using.

via Newton Mail [https://cloudmagic.com/k/d/mailapp?ct=pa&cv=8.6.38&pv=7.0&source=email_footer_2] On Thu, Sep 15, 2016 at 9:38 PM, Erwin Oldenkamp < notifications@github.com [notifications@github.com] > wrote:
@zackpollard [https://github.com/zackpollard] I've tried that first. But after implementing that version I noticed that you're limited to 5 Calls per repo and you're limited to pushes only. The hook wouldn't get triggered when making a pull request.
And implementing the "auto register" function would be imposible.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub [https://github.com//pull/5#issuecomment-247448498] , or mute the thread [https://github.com/notifications/unsubscribe-auth/ABQLKvnjNoal3iyBfOnrmVCrxyrnhczwks5qqazagaJpZM4I5RB9] .

Eernie · 2016-09-15T20:53:05Z

Then still there isn't a way to be as complient as the cloud version is. There you can choose the different events you want to send. The plugin you sent is a close source solution. So creating features for it wouldn't be posible. Therefor implementing the different kind of events wouldn't be possible.
The plugin is not written for this plugin only. We got more plans for it in the future :)

zackpollard · 2016-09-15T20:56:08Z

Yea it would just be nice to have additional options as in large enterprise wide bitbucket instances getting plugins installed can be difficult, so using what is already installed is easier :P

via Newton Mail [https://cloudmagic.com/k/d/mailapp?ct=pa&cv=8.6.38&pv=7.0&source=email_footer_2] On Thu, Sep 15, 2016 at 9:53 PM, Erwin Oldenkamp < notifications@github.com [notifications@github.com] > wrote:
Then still there isn't a way to be as complient as the cloud version is. There you can choose the different events you want to send. The plugin you sent is a close source solution. So creating features for it wouldn't be posible. Therefor implementing the different kind of events wouldn't be possible.
The plugin is not written for this plugin only. We got more plans for it in the future :)

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub [https://github.com//pull/5#issuecomment-247452230] , or mute the thread [https://github.com/notifications/unsubscribe-auth/ABQLKhnNrMkoV5zKCfLXtJ3GbyLTmm5Vks5qqbAygaJpZM4I5RB9] .

…B Server uses uppercase for usernames)

amuniz · 2016-09-17T19:20:47Z

This has been merged into master manually. I fixed some minor glitches (users being uppercase in Bitbucket Server) and other minor changes.

Always run BranchIndexing on master

Eernie added 3 commits June 16, 2016 23:37

revert to old code

4f9d1bc

Use the server repository

ac12eaa

amuniz reviewed Jul 2, 2016
View reviewed changes

Eernie added 2 commits July 3, 2016 00:10

Merge branch 'master' of github.com:jenkinsci/bitbucket-branch-source…

2f3210a

…-plugin into feature/moreSupportForBBServer # Conflicts: # src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/BitbucketSCMSourcePushHookReceiver.java

Reformat the code so its compliant to the code style of the repo

a60c543

Reformat the code so its compliant to the code style of the repo

6566de5

amuniz changed the title ~~Add support for the Bitbucket server.~~ [JENKINS-33507] Add support for the Bitbucket server. Jul 20, 2016

amuniz added a commit that referenced this pull request Sep 17, 2016

Fixing some glitches on PR #5 (ignoring case on user comparison, as B…

6319842

…B Server uses uppercase for usernames)

amuniz merged commit 6566de5 into jenkinsci:master Sep 17, 2016

Eernie deleted the feature/moreSupportForBBServer branch September 17, 2016 19:21

fengxx pushed a commit to fengxx/bitbucket-branch-source-plugin that referenced this pull request Mar 13, 2018

Merge pull request jenkinsci#5 from jglick/BranchIndexing-on-master

bbf6fe9

Always run BranchIndexing on master

KalleOlaviNiemitalo mentioned this pull request Mar 20, 2024

Feature/add support for pr approved #827

Open

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[JENKINS-33507] Add support for the Bitbucket server. #5

[JENKINS-33507] Add support for the Bitbucket server. #5

Eernie commented Jun 19, 2016 •

edited by amuniz

ghost commented Jun 20, 2016

tiny-dancer commented Jun 21, 2016

Jurrie commented Jun 23, 2016

amuniz Jul 2, 2016

amuniz commented Jul 2, 2016

Eernie commented Jul 2, 2016

tiny-dancer commented Jul 9, 2016

nickbroon commented Jul 20, 2016

jreijn commented Jul 22, 2016

Jurrie commented Jul 29, 2016

Eernie commented Aug 1, 2016

bhat-man commented Aug 25, 2016 •

edited

amuniz commented Aug 26, 2016

bhat-man commented Aug 26, 2016 •

edited

Mktmac commented Sep 12, 2016

markottaviani commented Sep 12, 2016

aheritier commented Sep 12, 2016

Eernie commented Sep 13, 2016

amuniz commented Sep 13, 2016

aheritier commented Sep 13, 2016

zackpollard commented Sep 15, 2016

zackpollard commented Sep 15, 2016

Eernie commented Sep 15, 2016

zackpollard commented Sep 15, 2016

Eernie commented Sep 15, 2016

zackpollard commented Sep 15, 2016

amuniz commented Sep 17, 2016

[JENKINS-33507] Add support for the Bitbucket server. #5

[JENKINS-33507] Add support for the Bitbucket server. #5

Conversation

Eernie commented Jun 19, 2016 • edited by amuniz

ghost commented Jun 20, 2016

tiny-dancer commented Jun 21, 2016

Jurrie commented Jun 23, 2016

amuniz Jul 2, 2016

Choose a reason for hiding this comment

amuniz commented Jul 2, 2016

Eernie commented Jul 2, 2016

tiny-dancer commented Jul 9, 2016

nickbroon commented Jul 20, 2016

jreijn commented Jul 22, 2016

Jurrie commented Jul 29, 2016

Eernie commented Aug 1, 2016

bhat-man commented Aug 25, 2016 • edited

amuniz commented Aug 26, 2016

bhat-man commented Aug 26, 2016 • edited

Mktmac commented Sep 12, 2016

markottaviani commented Sep 12, 2016

aheritier commented Sep 12, 2016

Eernie commented Sep 13, 2016

amuniz commented Sep 13, 2016

aheritier commented Sep 13, 2016

zackpollard commented Sep 15, 2016

zackpollard commented Sep 15, 2016

Eernie commented Sep 15, 2016

zackpollard commented Sep 15, 2016

Eernie commented Sep 15, 2016

zackpollard commented Sep 15, 2016

amuniz commented Sep 17, 2016

Eernie commented Jun 19, 2016 •

edited by amuniz

bhat-man commented Aug 25, 2016 •

edited

bhat-man commented Aug 26, 2016 •

edited