[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Kalle Niemitalo edited a comment on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist [BSERV-12284|https://jira.atlassian.com/browse/BSERV-12284] "Creating pull request does not reflect the stash-refs/pull-requests/<#> immediately" was moved to SHORT TERM BACKLOG on 2020-04-07. I wonder what Atlassian intends to do. It was then moved down to GATHERING INTEREST on 2020-04-14, and the priority was removed. :( Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.13025.1587107340276%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Kalle Niemitalo commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist BSERV-12284 "Creating pull request does not reflect the stash-refs/pull-requests/<#> immediately" was moved to SHORT TERM BACKLOG on 2020-04-07. I wonder what Atlassian intends to do. Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.8278.1586355420312%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Kevin Huber commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist You can use the hpi published by this PR: https://github.com/jenkinsci/bitbucket-branch-source-plugin/pull/294 HPI: https://repo.jenkins-ci.org/incrementals/org/jenkins-ci/plugins/cloudbees-bitbucket-branch-source/2.7.1-rc629.f242e60a14b4/ It falls back to heavyweight checkout, but at least PRs can be build with Bitbucket >= 7.x Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.3462.1585642740214%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Rick Landon commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist While this is being sorted out, does anyone have a suggested workaround? Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.3388.1585611120389%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Alexey Pelykh commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist That sounds much better, yet I'm not sure I'm qualified enough to make such PR Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12783.1585139760129%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Kalle Niemitalo commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist I would recommend doing the "fromRef" thing instead of testing which REST requests update "refs/pull-requests/*/from" as an undocumented side effect. Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12780.1585139640123%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Alexey Pelykh commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist I want to try HEAD instead of GET request next time Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12681.1585135200126%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Alexey Pelykh commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist I'm checking manually, so no way to track the time between that. I've created a pull request, did ls-remove, made API call using Postman and re-did ls-remote to verify it appeared Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12679.1585135140087%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title
Kalle Niemitalo commented on JENKINS-61493
Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Does Bitbucket Server ensure that the "refs/pull-requests/{id}/from" ref appears (or is updated) immediately after the diff request, or can there be a delay sometimes?
Add Comment
This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12675.1585135020215%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title
Alexey Pelykh commented on JENKINS-61493
Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Call to `/rest/api/1.0/projects/{PROJECT}/repos/{REPO}/pull-requests/19/diff` causes `/from` to appear
Add Comment
This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12662.1585134660146%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title
Kalle Niemitalo commented on JENKINS-61493
Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
It looks like that is what the Bitbucket Branch Source plugin does anyway, for Bitbucket Cloud. So, fixing the "refs/pull-requests/{id}/from" problem for pull requests within the same repository in Bitbucket Server could be just a matter of removing a few instanceof BitbucketCloudApiClient checks in BitbucketGitSCMBuilder.java and BitbucketSCMFileSystem.java. Fixing it for pull requests between forks would need more changes.
Add Comment
This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12273.1585076940751%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Alexey Pelykh commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist Second approach sounds really robust, yet I have no real idea what implications are there. Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12262.1585075200188%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Kalle Niemitalo commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist The newer Bitbucket Server Integration plugin does not even support pull requests yet, according to JENKINS-60342. Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12198.1585069380327%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title
Kalle Niemitalo edited a comment on JENKINS-61493
Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
I can think of two approaches that do not rely on Bitbucket Server updating the " / refs/pull-requests/\{id\}/from" ref: * Take the commit ID from the [webhook event payload|https://confluence.atlassian.com/bitbucketserver070/event-payload-996644369.html]. In [BSERV-8268|https://jira.atlassian.com/browse/BSERV-8268], Atlassian enabled {{uploadpack.allowReachableSHA1InWant}}, so this should work even if that commit is no longer the tip of any branch, as long as it is still reachable. However, if a user of Jenkins manually triggers a build, then I guess the webhook payload will not be available. * Query [/rest/api/1.0/projects/\{projectKey\}/repos/\{repositorySlug\}/pull-requests/\{pullRequestId\}|https://docs.atlassian.com/bitbucket-server/rest/7.0.1/bitbucket-rest.html#idp283] and get the name of the source branch from within the "fromRef" property.
Add Comment
This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12189.1585069020285%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title
Kalle Niemitalo commented on JENKINS-61493
Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
I can think of two approaches that do not rely on Bitbucket Server updating the "/refs/pull-requests/{id}/from" ref:
Take the commit ID from the webhook event payload. In BSERV-8268, Atlassian enabled uploadpack.allowReachableSHA1InWant, so this should work even if that commit is no longer the tip of any branch, as long as it is still reachable. However, if a user of Jenkins manually triggers a build, then I guess the webhook payload will not be available.
Query /rest/api/1.0/projects/{projectKey}/repos/{repositorySlug}/pull-requests/{pullRequestId} and get the name of the source branch from within the "fromRef" property.
Add Comment
This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12185.1585068661432%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Alexey Pelykh commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist Kalle Niemitalo seems so, huge blocker will take a look on various APIs maybe it's possible to trigger that somehow otherwise Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12176.1585067940123%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title
Kalle Niemitalo commented on JENKINS-61493
Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
The missing "/from" was filed two years ago as JENKINS-45997, and fixed in https://github.com/jenkinsci/bitbucket-branch-source-plugin/pull/116 by making the plugin poke the /rest/api/1.0/projects/{owner}/repos/{repo}/pull-requests/{id}/merge API, but that apparently stopped working in Bitbucket Server 7.
Add Comment
This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38)
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12164.1585067820132%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Alexey Pelykh commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist Update: I can trigger appearance of the "/from" ref only by viewing the diff. Super-bad behaviour Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12161.1585067760164%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Alexey Pelykh commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist Seems https://jira.atlassian.com/browse/BSERV-12198?focusedCommentId=2374169 is relatede as well Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12158.1585067640091%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Alexey Pelykh commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist It seems that unless non-author user actually tries to view the PR, the "/from" ref is not created. So when I just use PRs on my own - "/from" is not created whatsoever, that's seems to be a severe case Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12156.1585067040107%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Alexey Pelykh commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist Seems that on 7.1.0 "/from" are not revealed via ls-remove as well Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.12148.1585065720133%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title
Kalle Niemitalo updated an issue
Jenkins / JENKINS-61493
Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Change By:
Kalle Niemitalo
After upgrading to Bitbucket Server 7.0.1, we get this kind of error for every pull request in multibranch projects in which Jenkins has been configured to build the result of merging the pull request:{noformat} ERROR: Could not do lightweight checkout, falling back to heavyweight java.io.FileNotFoundException: URL: /rest/api/1.0/projects/REDACTED/repos/redacted/browse/Jenkinsfile?at=pull-requests%2F771%2Fmerge=0=500 at com.cloudbees.jenkins.plugins.bitbucket.server.client.BitbucketServerAPIClient.getRequest(BitbucketServerAPIClient.java:831) at com.cloudbees.jenkins.plugins.bitbucket.server.client.BitbucketServerAPIClient.getFileContent(BitbucketServerAPIClient.java:1123) at com.cloudbees.jenkins.plugins.bitbucket.filesystem.BitbucketSCMFile.content(BitbucketSCMFile.java:98) at jenkins.scm.api.SCMFile.contentAsString(SCMFile.java:335) at org.jenkinsci.plugins.workflow.multibranch.SCMBinder.create(SCMBinder.java:107) at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:303) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:427){noformat}{{git ls-remote origin}} shows that Bitbucket Server now publishes "refs/pull-requests/771/from" but not "refs/pull-requests/771/merge", even though the pull request has no merge conflicts (the target branch even has no new commits). This might be related to ["the switch from a 3-way diff to a 2-way diff in pull requests"|https://confluence.atlassian.com/bitbucketserver/bitbucket-server-7-0-release-notes-990546638.html#BitbucketServer7.0releasenotes-Amodifiedbehaviorfordiffs] in Bitbucket Server 7.0.0.Jenkins then does the heavyweight checkout and successfully merges the pull request, so the project ultimately builds OK, but the heavyweight checkout consumes a lot of time and disk space.There might not be any simple way to improve this in the bitbucket-branch-source plugin. If Bitbucket Server has deliberately ceased publishing "refs/pull-requests/*/merge", perhaps the plugin could do a three-way merge on Jenkinsfile only, rather than on the entire tree. - One way might be to use the REST API to get Jenkinsfile from the target branch ([/rest/api/1.0/projects/\{projectKey\}/repos/\{repositorySlug\}/browse/\{path:.*\}|https://docs.atlassian.com/bitbucket-server/rest/7.0.1/bitbucket-rest.html#idp208]) and any Jenkinsfile changes of the pull request as a patch ( , and then apply the patch to Jenkinsfile at the Jenkins master. Unfortunately, it does not seem easy to get a patch that can be applied: ** [/rest/api/1.0/projects/\{projectKey\}/repos/\{repositorySlug\}/pull-requests/\{pullRequestId\}.patch|https://docs.atlassian.com/bitbucket-server/rest/7.0.1/bitbucket-rest.html#idp289] gives the standard diff format but does not support limiting to a single file ; . **
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Kalle Niemitalo updated an issue Jenkins / JENKINS-61493 Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist Change By: Kalle Niemitalo Environment: Jenkins 2.204.5Bitbucket Branch Source Plugin 2.7.0Bitbucket Server 7.0.1 Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.7870.1584361980196%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Kalle Niemitalo commented on JENKINS-61493 Re: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist Mentioned in BSERV-11477 (comment). Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.7868.1584361860114%40Atlassian.JIRA.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title
Kalle Niemitalo updated an issue
Jenkins / JENKINS-61493
Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Change By:
Kalle Niemitalo
After upgrading to Bitbucket Server 7.0.1, we get this kind of error for every pull request in multibranch projects in which Jenkins has been configured to build the result of merging the pull request:{noformat} ERROR: Could not do lightweight checkout, falling back to heavyweight java.io.FileNotFoundException: URL: /rest/api/1.0/projects/REDACTED/repos/redacted/browse/Jenkinsfile?at=pull-requests%2F771%2Fmerge=0=500 at com.cloudbees.jenkins.plugins.bitbucket.server.client.BitbucketServerAPIClient.getRequest(BitbucketServerAPIClient.java:831) at com.cloudbees.jenkins.plugins.bitbucket.server.client.BitbucketServerAPIClient.getFileContent(BitbucketServerAPIClient.java:1123) at com.cloudbees.jenkins.plugins.bitbucket.filesystem.BitbucketSCMFile.content(BitbucketSCMFile.java:98) at jenkins.scm.api.SCMFile.contentAsString(SCMFile.java:335) at org.jenkinsci.plugins.workflow.multibranch.SCMBinder.create(SCMBinder.java:107) at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:303) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:427){noformat}{{git ls-remote origin}} shows that Bitbucket Server now publishes "refs/pull-requests/771/from" but not "refs/pull-requests/771/merge", even though the pull request has no merge conflicts (the target branch even has no new commits). This might be related to ["the switch from a 3-way diff to a 2-way diff in pull requests"|https://confluence.atlassian.com/bitbucketserver/bitbucket-server-7-0-release-notes-990546638.html#BitbucketServer7.0releasenotes-Amodifiedbehaviorfordiffs] in Bitbucket Server 7.0.0.Jenkins then does the heavyweight checkout and successfully merges the pull request, so the project ultimately builds OK, but the heavyweight checkout consumes a lot of time and disk space. I don't know whether there is There might not be any simple way to fix improve this in the bitbucket-branch-source plugin. If Bitbucket Server has deliberately ceased publishing "refs/pull-requests/*/merge", perhaps the plugin could do a three-way merge on Jenkinsfile only, rather than on the entire tree. That would require - One way might be to use the REST API to get Jenkinsfile from the target branch ([/rest/api/1.0/projects/\{projectKey\}/repos/\{repositorySlug\}/browse/\{path:.*\}|https://docs.atlassian.com/bitbucket-server/rest/7.0.1/bitbucket-rest.html#idp208]) and any Jenkinsfile changes of the pull request as a patch ([/rest/api/1.0/projects/\{projectKey\}/repos/\{repositorySlug\}/pull-requests/\{pullRequestId\}.patch|https://docs.atlassian.com/bitbucket-server/rest/7.0.1/bitbucket-rest.html#idp289] gives the standard diff format but does not support limiting to a single file;
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title
Kalle Niemitalo updated an issue
Jenkins / JENKINS-61493
Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Change By:
Kalle Niemitalo
After upgrading to Bitbucket Server 7.0.1, we get this kind of error for every pull request in multibranch projects in which Jenkins has been configured to build the result of merging the pull request:{noformat} ERROR: Could not do lightweight checkout, falling back to heavyweight java.io.FileNotFoundException: URL: /rest/api/1.0/projects/ SISU REDACTED /repos/ rahti-hybrid redacted /browse/Jenkinsfile?at=pull-requests%2F771%2Fmerge=0=500 at com.cloudbees.jenkins.plugins.bitbucket.server.client.BitbucketServerAPIClient.getRequest(BitbucketServerAPIClient.java:831) at com.cloudbees.jenkins.plugins.bitbucket.server.client.BitbucketServerAPIClient.getFileContent(BitbucketServerAPIClient.java:1123) at com.cloudbees.jenkins.plugins.bitbucket.filesystem.BitbucketSCMFile.content(BitbucketSCMFile.java:98) at jenkins.scm.api.SCMFile.contentAsString(SCMFile.java:335) at org.jenkinsci.plugins.workflow.multibranch.SCMBinder.create(SCMBinder.java:107) at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:303) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:427){noformat}{{git ls-remote origin}} shows that Bitbucket Server now publishes "refs/pull-requests/771/from" but not "refs/pull-requests/771/merge", even though the pull request has no merge conflicts (the target branch even has no new commits). This might be related to ["the switch from a 3-way diff to a 2-way diff in pull requests"|https://confluence.atlassian.com/bitbucketserver/bitbucket-server-7-0-release-notes-990546638.html#BitbucketServer7.0releasenotes-Amodifiedbehaviorfordiffs] in Bitbucket Server 7.0.0.Jenkins then does the heavyweight checkout and successfully merges the pull request, so the project ultimately builds OK, but the heavyweight checkout consumes a lot of time and disk space.I don't know whether there is any simple way to fix this in the bitbucket-branch-source plugin. If Bitbucket Server has deliberately ceased publishing "refs/pull-requests/*/merge", perhaps the plugin could do a three-way merge on Jenkinsfile only, rather than on the entire tree. That would require a REST API for getting the commit ID of a merge base though, and I don't know whether such a thing exists.
[JIRA] (JENKINS-61493) Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist
Title: Message Title Kalle Niemitalo updated an issue Jenkins / JENKINS-61493 Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/merge does not exist Change By: Kalle Niemitalo Summary: Lightweight checkout fails in Bitbucket Server 7.0; refs/pull-requests/*/ from merge does not exist Add Comment This message was sent by Atlassian Jira (v7.13.12#713012-sha1:6e07c38) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.205179.1584360231000.7826.1584360300210%40Atlassian.JIRA.
