Skip to content

fix: add merge_group trigger to unblock merge queue#4338

Merged
olegsu merged 2 commits into
mainfrom
fix/merge-queue-ci-triggers
Apr 9, 2026
Merged

fix: add merge_group trigger to unblock merge queue#4338
olegsu merged 2 commits into
mainfrom
fix/merge-queue-ci-triggers

Conversation

@olegsu
Copy link
Copy Markdown
Collaborator

@olegsu olegsu commented Apr 9, 2026

Summary

  • Added merge_group: trigger to 4 workflow files so CI runs during GitHub merge queue processing
  • Fixed stale .mergify.yml queue_rules that referenced a previous CI system's check names

Root Cause

GitHub's native merge queue fires a merge_group event for each batch of queued PRs. Without this trigger in the workflow files, no checks ran on merge queue commits. The required status checks (Lint, Unit Test, Package Cloudbeat, Manifest Tests, Test Rego Policies) were never reported, leaving the queue stuck in AWAITING_CHECKS indefinitely.

Fixes

Workflows (added merge_group: trigger)

File Checks produced
ci-pull_request.yml Lint, Unit Test
packaging.yml Package Cloudbeat (docker), Package Cloudbeat (tar.gz)
unit-test.yml Manifest Tests
test-opa-policies.yml Test Rego Policies

.mergify.yml queue_rules

Replaced 6 non-existent check names (from old Cloudbeat-CI system) with the correct current check names.

Test plan

🤖 Generated with Claude Code

GitHub's native merge queue fires a merge_group event when processing
batched PRs. Without this trigger in workflows, no CI ran on merge
queue commits — leaving the queue stuck in AWAITING_CHECKS.

Added merge_group trigger to:
- ci-pull_request.yml (Lint, Unit Test)
- packaging.yml (Package Cloudbeat docker/tar.gz)
- unit-test.yml (Manifest Tests)
- test-opa-policies.yml (Test Rego Policies)

Also updated .mergify.yml queue_rules to replace stale check names
from the previous CI system with the correct current check names.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@olegsu olegsu requested a review from a team as a code owner April 9, 2026 18:45
@mergify mergify Bot assigned olegsu Apr 9, 2026
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Apr 9, 2026

This pull request does not have a backport label. Could you fix it @olegsu? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@olegsu olegsu added backport-skip Team:Security-Cloud Services Security Data Experience - Cloud Services team. labels Apr 9, 2026
@olegsu olegsu merged commit 55d5dcc into main Apr 9, 2026
12 checks passed
@olegsu olegsu deleted the fix/merge-queue-ci-triggers branch April 9, 2026 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-skip Team:Security-Cloud Services Security Data Experience - Cloud Services team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant