Skip to content

Conversation

@ShravaniVangur
Copy link
Contributor

Describe what this PR does

Currently, when a queue operation is triggered with mergifyio, the ok-to-test label is being added even when the ci/skip/e2e label is present. This PR updates the logic to ensure that the ci/skip/e2e label is handled correctly.

In this PR:

  • For pull_request_rules: Before adding the ok-to-test label, the presence of the ci/skip/e2e label is checked. If it is present, the ok-to-test label is not added.

  • For queue_rules: If the ci/skip/e2e label is present and the basic tests have passed, the merge will be triggered.

Fixes: #5156

@mergify mergify bot added the component/testing Additional test cases or CI work label Mar 11, 2025
Copy link
Member

@nixpanic nixpanic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me, just need to add the missing (non-e2e) CI jobs

@ShravaniVangur ShravaniVangur requested a review from nixpanic March 11, 2025 09:51
@nixpanic nixpanic added ci/skip/e2e skip running e2e CI jobs ci/skip/multi-arch-build skip building on multiple architectures labels Mar 11, 2025
nixpanic
nixpanic previously approved these changes Mar 11, 2025
Copy link
Member

@nixpanic nixpanic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@nixpanic nixpanic requested a review from a team March 11, 2025 09:55
Copy link
Contributor

@Rakshith-R Rakshith-R left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same changes are needed for dependabot and two automatic merge pull request rules.

@mergify mergify bot dismissed nixpanic’s stale review March 11, 2025 10:42

Pull request has been modified.

Comment on lines +150 to +146
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
- "status-success=ci/centos/k8s-e2e-external-storage/1.32"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.32"
- "status-success=ci/centos/mini-e2e/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.31"
- "status-success=ci/centos/mini-e2e/k8s-1.32"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
- "status-success=ci/centos/k8s-e2e-external-storage/1.32"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.32"
- "status-success=ci/centos/mini-e2e/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.31"
- "status-success=ci/centos/mini-e2e/k8s-1.32"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
-or:
- label=ci/skip/e2e
- and:
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
- "status-success=ci/centos/k8s-e2e-external-storage/1.32"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.32"
- "status-success=ci/centos/mini-e2e/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.31"
- "status-success=ci/centos/mini-e2e/k8s-1.32"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"

I think something like this is better ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you adopt this same format at all places where centos-ci status is being checked ?

release branches are being left out currently in this pr.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adapted this format for pull_request_rules and queue_rules.

@ShravaniVangur ShravaniVangur force-pushed the skipe2eLabel branch 2 times, most recently from 82259c5 to 2a616e4 Compare March 11, 2025 14:35
@ShravaniVangur ShravaniVangur requested a review from nixpanic March 12, 2025 05:32
Copy link
Contributor

@Rakshith-R Rakshith-R left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks !
LGTM

@nixpanic
Copy link
Member

@Mergifyio queue

@mergify
Copy link
Contributor

mergify bot commented Mar 12, 2025

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 3ea4199

updates mergify rules to handle ci/skip/e2e label

Signed-off-by: ShravaniVangur <[email protected]>
@mergify mergify bot added the ok-to-test Label to trigger E2E tests label Mar 12, 2025
@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.31

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.32

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.31

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.32

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.31

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.32

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Mar 12, 2025
@mergify mergify bot merged commit 3ea4199 into ceph:devel Mar 12, 2025
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci/skip/e2e skip running e2e CI jobs ci/skip/multi-arch-build skip building on multiple architectures component/testing Additional test cases or CI work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Mergifyio should not add ok-to-test label in case ci/skip/e2e label is present

4 participants