shipit-engine: Merge Queue Inconsistency/Failure

I added a PR to the Merge Queue (after enabling it in settings). It showed up on the Merge Queue page immediately. Then I refreshed the page, and the merge queue was back to 0 and my PR was no longer in the merge queue. Additionally sometimes on the Commits and Deploys page, I show Merge Queue (1), other times Merge Queue (0). It is still un-merged, but passing (as seen below). I’ve added the shipit.yml below as well to help debug. There are no error-level logs from either sidekiq or rails.

Here’s my shipit.yml:

deploy:
  override:
    - make deploy
merge:
  require:
    - continuous-integration/jenkins/pr-merge
  ignore:
    - continuous-integration/jenkins/branch

After adding by ID

Build Status from Github Passing Build Status

About this issue

Original URL
State: closed
Created 6 years ago
Comments: 17 (8 by maintainers)

Most upvoted comments

I didn’t have time to look at this today, but yeah in term of directions you could also add some logging in: https://github.com/Shopify/shipit-engine/blob/891ab7403f03b3209b2755e2dce284e94beca1b3/app/jobs/shipit/merge_pull_requests_job.rb

It’s possible the API call to merge fails for some reason, and it’s interpreted as the PR not being ready to merge (when the PR was freshly rebased on things like that, the merge request can legitimately fail and you are suppose to retry).

byroot on May 24, 2018