[Bitbucket] Config flag bbUseDevelopmentBranch doesn't work (main branch used instead)

[matemijolovic]

How are you running Renovate?

Self-hosted Renovate

If you're self-hosting Renovate, tell us what version of Renovate you run.

37.141.1

If you're self-hosting Renovate, select which platform you are using.

Bitbucket Cloud (bitbucket.org)

Was this something which used to work for you, and then stopped?

I have not seen this working

Describe the problem

Hello,

I'm trying to set up Renovate to work with Bitbucket Cloud repositories that have a DEVELOPMENT branch set up (via Bitbucket UI). I've tried adding the flag bbUseDevelopmentBranch to the config but it didn't seem to have any effect.

Minimal reproduction:

1. Create a Bitbucket Cloud repository with separate main and develop branches (annotated as MAIN and DEVELOPMENTin the repository settings, respectively) - or, alternatively, fork any repo with a separate development branch
2. Add renovate.json config to the develop branch
3. Connect Renovate to the given repository and enable config flag bbUseDevelopmentBranch (EDIT: to clarify, the flag is added to the global config)

I've tracked down the issue:

1. The BB endpoint /2.0/repositories/some/repo/branching-model returns the correct data and the config entry defaultBranch is correctly set to a development branch
2. The bug seems to live here: syncGit command doesn't respect the defaultBranch setting when cloning the PR (source)

The fix seems simple: just add additional opt -b <default_branch> and fix how config.currentBranch is set afterwards.

Pull request: #26810

Relevant debug logs

Details

I've masked the sensitive data

DEBUG: Using localDir: /var/folders/2s/96lg10vj4_v8rt7ntb5dkp9w0000gn/T/renovate/repos/bitbucket/org/repo (repository=org/repo)
DEBUG: PackageFiles.clear() - Package files deleted (repository=org/repo)
DEBUG: initRepo("org/repo") (repository=org/repo)
DEBUG: hostRules: applying Basic authentication for api.bitbucket.org (repository=org/repo)
DEBUG: org/repo owner = org (repository=org/repo)
DEBUG: Resetting npmrc (repository=org/repo)
DEBUG: Resetting npmrc (repository=org/repo)
DEBUG: checkOnboarding() (repository=org/repo)
DEBUG: isOnboarded() (repository=org/repo)
DEBUG: findPr(renovate/configure, Configure Renovate, !open) (repository=org/repo)
DEBUG: getPrList() (repository=org/repo)
DEBUG: Syncing PR list (repository=org/repo)
DEBUG: findPr(renovate/configure, chore: Configure Renovate, !open) (repository=org/repo)
DEBUG: getPrList() (repository=org/repo)
DEBUG: Found PR #1319 (repository=org/repo)
DEBUG: findFile(renovate.json) (repository=org/repo)
DEBUG: Initializing git repository into /var/folders/2s/96lg10vj4_v8rt7ntb5dkp9w0000gn/T/renovate/repos/bitbucket/org/repo (repository=org/repo)
DEBUG: Performing blobless clone (repository=org/repo)
DEBUG: git clone completed (repository=org/repo)
       "durationMs": 38939
DEBUG: latest repository commit (repository=org/repo)
       "latestCommit": ***
DEBUG: findFile(renovate.json5) (repository=org/repo)
DEBUG: findFile(.github/renovate.json) (repository=org/repo)
DEBUG: findFile(.github/renovate.json5) (repository=org/repo)
DEBUG: findFile(.gitlab/renovate.json) (repository=org/repo)
DEBUG: findFile(.gitlab/renovate.json5) (repository=org/repo)
DEBUG: findFile(.renovaterc) (repository=org/repo)
DEBUG: findFile(.renovaterc.json) (repository=org/repo)
DEBUG: findFile(.renovaterc.json5) (repository=org/repo)
DEBUG: config file not found (repository=org/repo)
DEBUG: Found closed onboarding PR (repository=org/repo)
DEBUG: Repo is not onboarded and no merged PRs exist (repository=org/repo)
DEBUG: Found 3 comments (repository=org/repo)
DEBUG: Ensuring comment "Renovate is disabled" in #1319 (repository=org/repo)
DEBUG: Comment is already update-to-date (repository=org/repo)
 INFO: Repository is disabled - skipping (repository=org/repo)
DEBUG: Repository result: disabled-closed-onboarding, status: disabled, enabled: false, onboarded: undefined (repository=org/repo)

Have you created a minimal reproduction repository?

I have linked to a minimal reproduction in the description above

[viceice]

the renovate.json needs to be on default branch or set that option on global bot config.

[matemijolovic]

I put the option in the global config and I can confirm it's enabled in the debugger. EDIT: also, default branch is `develop` in my case and it contains a `renovate.json`

…

On Mon, 22 Jan 2024, 17:36 Michael Kriese, ***@***.***> wrote: the renovate.json needs to be on default branch or set that option on global bot config. — Reply to this email directly, view it on GitHub <#26805 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AD7WYKWRRIJCS5QN7T2N4ITYP2IP7AVCNFSM6AAAAABCFHLVPSVHI2DSMVQWIX3LMV43SRDJONRXK43TNFXW4Q3PNVWWK3TUHM4DEMJRGAYDA> . You are receiving this because you authored the thread.Message ID: ***@***.***>

[matemijolovic]

Hi, after digging a bit deeper today I found out this is also related to the baseBranches global config setting. I've included the test that triggers the undesired behaviour in the PR.

[matemijolovic]

Resolved in #26810