Skip to content

merge queue: checking devel (190d9bc) and #6431 together #6433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 3 commits into from
Closed

merge queue: checking devel (190d9bc) and #6431 together #6433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61059aa
Revert "ci: remove ok-to-test from merge-queue labels copier"
iPraveenParihar Jul 28, 2026
7228a6c
Revert "ci: serialize merge queue CI runs and split merge conditions"
iPraveenParihar Jul 28, 2026
c5c4d37
Merge of #6431
mergify[bot] Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/mergify-copy-labels.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ jobs:
- name: Copying labels
uses: Mergifyio/gha-mergify-merge-queue-labels-copier@1d2b277f94d52987008ec05b571fb68f2357e63f # main
with:
additional-labels: 'ok-to-test'
token: ${{ secrets.CEPH_CSI_BOT_TOKEN }}
135 changes: 52 additions & 83 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ defaults:

merge_protections_settings:
reporting_method: check-runs
auto_merge_conditions: true

queue_rules:
- name: default
Expand Down Expand Up @@ -43,57 +44,56 @@ queue_rules:
- "status-success=commitlint"
# exclude the ci/centos branch from above status checks
- base=ci/centos
merge_conditions:
- or:
# requirements per branch
- and:
# ci/skip/e2e label has no meaning on ci/centos
- base!=ci/centos
- label=ci/skip/e2e
- and:
- base~=^(release-.+)$
- "status-success=ci/centos/k8s-e2e-external-storage/1.33"
- "status-success=ci/centos/k8s-e2e-external-storage/1.34"
- "status-success=ci/centos/k8s-e2e-external-storage/1.35"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.33"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.34"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.35"
- "status-success=ci/centos/mini-e2e/k8s-1.33"
- "status-success=ci/centos/mini-e2e/k8s-1.34"
- "status-success=ci/centos/mini-e2e/k8s-1.35"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- and:
- base=release-v3.16
- "status-success=ci/centos/k8s-e2e-external-storage/1.32"
- "status-success=ci/centos/k8s-e2e-external-storage/1.33"
- "status-success=ci/centos/k8s-e2e-external-storage/1.34"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.32"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.33"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.34"
- "status-success=ci/centos/mini-e2e/k8s-1.32"
- "status-success=ci/centos/mini-e2e/k8s-1.33"
- "status-success=ci/centos/mini-e2e/k8s-1.34"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- and:
- base=devel
- "status-success=ci/centos/k8s-e2e-external-storage/1.34"
- "status-success=ci/centos/k8s-e2e-external-storage/1.35"
- "status-success=ci/centos/k8s-e2e-external-storage/1.36"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.34"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.35"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.36"
- "status-success=ci/centos/mini-e2e/k8s-1.34"
- "status-success=ci/centos/mini-e2e/k8s-1.35"
- "status-success=ci/centos/mini-e2e/k8s-1.36"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- and:
# requirements for ci/centos branch
- base=ci/centos
- "status-success=ci/centos/job-validation"
- "status-success=ci/centos/jjb-validate"
- or:
# requirenents per branch
- and:
# ci/skip/e2e label has no meaning on ci/centos
- base!=ci/centos
- label=ci/skip/e2e
- and:
- base~=^(release-.+)$
- "status-success=ci/centos/k8s-e2e-external-storage/1.33"
- "status-success=ci/centos/k8s-e2e-external-storage/1.34"
- "status-success=ci/centos/k8s-e2e-external-storage/1.35"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.33"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.34"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.35"
- "status-success=ci/centos/mini-e2e/k8s-1.33"
- "status-success=ci/centos/mini-e2e/k8s-1.34"
- "status-success=ci/centos/mini-e2e/k8s-1.35"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- and:
- base=release-v3.16
- "status-success=ci/centos/k8s-e2e-external-storage/1.32"
- "status-success=ci/centos/k8s-e2e-external-storage/1.33"
- "status-success=ci/centos/k8s-e2e-external-storage/1.34"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.32"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.33"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.34"
- "status-success=ci/centos/mini-e2e/k8s-1.32"
- "status-success=ci/centos/mini-e2e/k8s-1.33"
- "status-success=ci/centos/mini-e2e/k8s-1.34"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- and:
- base=devel
- "status-success=ci/centos/k8s-e2e-external-storage/1.34"
- "status-success=ci/centos/k8s-e2e-external-storage/1.35"
- "status-success=ci/centos/k8s-e2e-external-storage/1.36"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.34"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.35"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.36"
- "status-success=ci/centos/mini-e2e/k8s-1.34"
- "status-success=ci/centos/mini-e2e/k8s-1.35"
- "status-success=ci/centos/mini-e2e/k8s-1.36"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- and:
# requirements for ci/centos branch
- base=ci/centos
- "status-success=ci/centos/job-validation"
- "status-success=ci/centos/jjb-validate"

merge_queue:
max_parallel_checks: 1
Expand All @@ -109,44 +109,13 @@ pull_request_rules:
- not: check-pending~=^ci/centos
- not: status-success~=^ci/centos
- or:
- queue-position = 0
- queue-position >= 0
- author=mergify[bot]
actions:
label:
add:
- ok-to-test

- name: label PRs entering the merge queue
conditions:
- -closed
- queue-position >= 0
actions:
label:
add:
- queued

- name: remove queued label when PR leaves the merge queue
conditions:
- label=queued
- not: queue-position >= 0
actions:
label:
remove:
- queued

- name: prevent concurrent CI for queued PRs not first in line
conditions:
- label=ok-to-test
- queue-position > 0
- base~=^(devel)|(release-.+)$
actions:
label:
remove:
- ok-to-test
comment:
# yamllint disable-line rule:line-length
message: "The `ok-to-test` label was removed because this PR is waiting in the merge queue. CI will start automatically when the PR reaches the front of the queue."

- name: remove outdated approvals
conditions:
- base~=^(devel)|(release-.+)$
Expand Down
Loading