Skip to content

TRT-1854: translate test annotations to use: include/exclude CEL, labels, filtering #2215

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

Merged

Conversation

smg247
Copy link
Member

@smg247 smg247 commented Feb 24, 2025

openshift-tests-extension introduces a new way to skip upstream tests based on environment flags and include/exclude fields present on the listed tests. This PR translates the existing annotations to that functionality, but leaves them in place. They will be removed in a later PR.

@openshift-ci-robot openshift-ci-robot added backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Feb 24, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2025

@smg247: This pull request references TRT-1854 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

openshift-tests-extension introduces a new way to skip upstream tests based on environment flags and include/exclude fields present on the listed tests. This PR translates the existing test skips to that functionality.

There will be a followup to this to remove the other annotations, and eventually the framework itself.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

@smg247: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@smg247
Copy link
Member Author

smg247 commented Feb 24, 2025

/hold to merge after #2214

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2025
@openshift-ci openshift-ci bot requested review from deads2k and jerpeter1 February 24, 2025 20:04
@openshift-ci openshift-ci bot added the vendor-update Touching vendor dir or related files label Feb 24, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2025

@smg247: This pull request references TRT-1854 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

openshift-tests-extension introduces a new way to skip upstream tests based on environment flags and include/exclude fields present on the listed tests. This PR translates the existing test skips to that functionality.

I have generated a diff of the output of k8s-tests-ext list prior to, and after this change for verification purposes.

There will be a followup to this to remove the other annotations, and eventually the framework itself.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 25, 2025
@smg247 smg247 force-pushed the translate-test-skips-to-env-flags branch from 4abe9c8 to db6b8e5 Compare February 26, 2025 12:12
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 26, 2025
@openshift-ci-robot
Copy link

@smg247: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@openshift-ci-robot
Copy link

@smg247: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@smg247
Copy link
Member Author

smg247 commented Feb 26, 2025

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 26, 2025
@smg247
Copy link
Member Author

smg247 commented Feb 26, 2025

/hold to figure out test mapping with the name changes prior to merge

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 26, 2025
@smg247 smg247 force-pushed the translate-test-skips-to-env-flags branch from 77fa839 to 0e529d9 Compare February 27, 2025 18:41
@openshift-ci-robot
Copy link

@smg247: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 27, 2025

@smg247: This pull request references TRT-1854 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

openshift-tests-extension introduces a new way to skip upstream tests based on environment flags and include/exclude fields present on the listed tests. This PR translates the existing test skips to that functionality, but leaves the annotations alone. They will be removed in a later PR.

I have generated a diff of the output of k8s-tests-ext list prior to, and after this change for verification purposes. This diff was generated when we were removing the annotations from the test names, that part will no longer be happening with this PR.

There will be a followup to this to translate the other annotations, and eventually the framework itself.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@smg247 smg247 changed the title TRT-1854: make use of include/exclude CEL and remove SKIPPED annotations TRT-1854: make use of include/exclude CEL Feb 27, 2025
@smg247
Copy link
Member Author

smg247 commented Feb 27, 2025

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 27, 2025
@smg247 smg247 force-pushed the translate-test-skips-to-env-flags branch from 0e529d9 to 54463b0 Compare February 28, 2025 15:13
@openshift-ci-robot
Copy link

@smg247: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@stbenjam
Copy link
Member

/lgtm

@smg247 smg247 force-pushed the translate-test-skips-to-env-flags branch from 07d1643 to 4fa2f14 Compare March 13, 2025 18:19
@openshift-ci-robot
Copy link

@smg247: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

Copy link
Member

@bertinatto bertinatto left a comment

Choose a reason for hiding this comment

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

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 14, 2025
Copy link
Member

@bertinatto bertinatto left a comment

Choose a reason for hiding this comment

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

Things that I'd like to see in follow-ups:

  1. Some mechanism to detect a rule that doesn't match any test
  2. Some mechanism to continue running k8s-* jobs in this repository once the annotations are gone

@smg247 smg247 force-pushed the translate-test-skips-to-env-flags branch from 4fa2f14 to d0c1b6d Compare March 17, 2025 10:25
@openshift-ci-robot
Copy link

@smg247: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

Copy link
Member

@bertinatto bertinatto left a comment

Choose a reason for hiding this comment

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

/remove-label backports/unvalidated-commits
/label backports/validated-commits

@openshift-ci openshift-ci bot added backports/validated-commits Indicates that all commits come to merged upstream PRs. and removed backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. labels Mar 17, 2025
@stbenjam
Copy link
Member

/lgtm

@stbenjam
Copy link
Member

/test verify

Copy link

openshift-ci bot commented Mar 17, 2025

@stbenjam: No presubmit jobs available for openshift/kubernetes@master

In response to this:

/test verify

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2025
Copy link

openshift-ci bot commented Mar 17, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, smg247, stbenjam

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@smg247
Copy link
Member Author

smg247 commented Mar 17, 2025

/retest-required

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD f4a27c4 and 2 for PR HEAD d0c1b6d in total

@smg247
Copy link
Member Author

smg247 commented Mar 17, 2025

/retest-required

@smg247
Copy link
Member Author

smg247 commented Mar 17, 2025

/test verify

@smg247
Copy link
Member Author

smg247 commented Mar 17, 2025

/retest-required

1 similar comment
@smg247
Copy link
Member Author

smg247 commented Mar 17, 2025

/retest-required

Copy link

openshift-ci bot commented Mar 17, 2025

@smg247: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-csi d0c1b6d link false /test e2e-aws-csi
ci/prow/okd-scos-e2e-aws-ovn d0c1b6d link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 2ed17b4 into openshift:master Mar 17, 2025
21 of 23 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-pod
This PR has been included in build openshift-enterprise-pod-container-v4.19.0-202503180241.p0.g2ed17b4.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-hyperkube
This PR has been included in build openshift-enterprise-hyperkube-container-v4.19.0-202503180241.p0.g2ed17b4.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: kube-proxy
This PR has been included in build kube-proxy-container-v4.19.0-202503180241.p0.g2ed17b4.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-kube-apiserver-artifacts
This PR has been included in build ose-installer-kube-apiserver-artifacts-container-v4.19.0-202503180241.p0.g2ed17b4.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backports/validated-commits Indicates that all commits come to merged upstream PRs. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants