-
Couldn't load subscription status.
- Fork 580
ci: update rule for ci/skip/e2e #5208
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.
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
Conversation
There was a problem hiding this 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
d2ccd2d to
0f1cbfc
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
There was a problem hiding this 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.
0f1cbfc to
5a81668
Compare
| - "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" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| - "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 ?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
82259c5 to
2a616e4
Compare
2a616e4 to
e6ef695
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks !
LGTM
|
@Mergifyio queue |
✅ The pull request has been merged automaticallyThe pull request has been merged automatically at 3ea4199 |
updates mergify rules to handle ci/skip/e2e label Signed-off-by: ShravaniVangur <[email protected]>
e6ef695 to
ce94ee3
Compare
|
/test ci/centos/k8s-e2e-external-storage/1.30 |
|
/test ci/centos/k8s-e2e-external-storage/1.31 |
|
/test ci/centos/mini-e2e-helm/k8s-1.30 |
|
/test ci/centos/upgrade-tests-cephfs |
|
/test ci/centos/k8s-e2e-external-storage/1.32 |
|
/test ci/centos/mini-e2e-helm/k8s-1.31 |
|
/test ci/centos/mini-e2e/k8s-1.30 |
|
/test ci/centos/mini-e2e-helm/k8s-1.32 |
|
/test ci/centos/upgrade-tests-rbd |
|
/test ci/centos/mini-e2e/k8s-1.31 |
|
/test ci/centos/mini-e2e/k8s-1.32 |
Describe what this PR does
Currently, when a queue operation is triggered with mergifyio, the
ok-to-testlabel is being added even when theci/skip/e2elabel is present. This PR updates the logic to ensure that theci/skip/e2elabel is handled correctly.In this PR:
For
pull_request_rules: Before adding theok-to-testlabel, the presence of theci/skip/e2elabel is checked. If it is present, theok-to-test labelis not added.For
queue_rules: If theci/skip/e2elabel is present and the basic tests have passed, the merge will be triggered.Fixes: #5156