Not able to promote work items past first stage: Rebase failures

[crkelley]

Describe the bug After deploying an approved work item to the first stage of our pipeline we try to promote the work item to the second stage and receive the error "Promotion Blocked: Promotion blocked due to dependency". We didn't receive any errors in the UI when promoting to the first stage - everything displayed as successful. Upon reviewing Activity History we noticed an error stating "Rebase of WI-XXXXXX branch from QA branch failed".

Once this error occurs the pipeline is stuck. I tried manually rebasing the branch and even though that is successful, the pipeline continues to throw the dependency error.

To Reproduce Steps to reproduce the behavior:

1. Get 2 work items to approved state (New account field in each work item)
2. Promote one work item to first stage: Integration
3. Promote second work item to first stage: Integration
4. Try to promote second work item to second stage: UAT
5. Review error: Promotion Blocked
6. Click on Activity History
7. Review Rebase errors from Promotion to first stage ...

Expected behavior After promoting to the first stage, we should be able to select any of the available work items and promote to the next stage

Screenshots If applicable, add screenshots to help explain your problem.

Additional context Repository is set up under an organization. We created a brand new repository with branches for the test and checked settings to ensure we didn't have anything blocking rebases.

[crkelley]

I've tested the exact same scenarios with a personal repository and all pipeline functionality works as expected. There aren't any dependencies between the 2 new fields being created so I'm not sure why we are receiving a dependency error.

[kylewalke]

Hi @crkelley, thank you for this bug report. We are not exactly sure what is causing this issue with org-owned repositories but we are looking into it. The details and screenshots are greatly appreciated and help us quite a bit. Can you confirm for us that your current running user in GitHub is fully granted collaborator access and accepted the permissions via the email GitHub sends?

[git2gus[bot]]

Error while creating work item!

[kylewalke]

@GilsonCanario pls tag with appropriate next steps for investigation or bug here.

[crkelley]

Hey @kylewalke, yes I am a fully granted collaborator (admin role) on the repository and the organization access has been approved.

Repo role

Application OAuth Access under my user

Third-party access under organization

[git2gus[bot]]

Error while creating work item!

[crkelley]

Hey @kylewalke, I set up a whole new repository and project to ensure I could reproduce the issue and the error did occur again. I promoted both work items to the first stage and both received the Rebase error. The pipeline is now stuck as both work items will not allow a promotion to the next stage.

[kylewalke]

@crkelley as a quick check as well, were these steps followed prior to this error https://help.salesforce.com/s/articleView?id=sf.devops_center_org_owns_github_repo.htm&type=5 ?

[crkelley]

Hey @kylewalke, yes we did follow those instructions for our org owned repository.

[mrryantrammell]

We are experiencing the same issue and it has occurred in 2 different pipelines. The most recent pipeline has 4 work items in it:

1. Changes for a large project - this item was set to 'Never' status
2. Picklist update for field on Task object - this has been deployed to production
3. New Permission sets and named credential - this has been deployed to production
4. New custom fields for lead and contact objects - this is erroring out due to 'dependencies'

There are page layouts in item 4 that were included in item 1; however, all other changes are unique.

[jaapvandermolen]

Was this ever resolved? We have this issue now too