Skip to content

TRT-2113: Remove annotation framework in favor of environment selectors #2393

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

Jump to bottom
Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

TRT-2113: Remove annotation framework in favor of environment selectors #2393

wants to merge 1 commit into from

Conversation

smg247
Copy link
Member

@smg247 smg247 commented Aug 4, 2025

Now that suites have been fully implemented within OTE, we can entirely remove the annotation framework and rely on environment selectors to do the test skips. This removes that framework, and cleans up the code that used to utilize it. It also simplifies the suite additions in k8s-tests.go as there is no reason to filter out disabled tests from the suites, as those tests won't be present anyways due to this logic.

@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 Aug 4, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 4, 2025 •
edited by openshift-ci bot
Loading

@smg247: This pull request references TRT-2113 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 sub-task to target the "4.20.0" version, but no target version was set.

In response to this:

Now that suites have been fully implemented within OTE, we can entirely remove the annotation framework and rely on environment selectors to do the test skips. This removes that framework, and cleans up the code that used to utilize it. It also simplifies the suite additions in k8s-tests.go as there is no reason to filter out disabled tests from the suites, as those tests won't be present anyways due to this logic.

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.

@openshift-ci openshift-ci bot requested review from benluddy and jerpeter1 August 4, 2025 18:49
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Aug 4, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: smg247
Once this PR has been reviewed and has the lgtm label, please assign benluddy for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 Aug 4, 2025

/hold for openshift-eng/ci-test-mapping#386

@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 Aug 4, 2025
@smg247
Copy link
Member Author

smg247 commented Aug 4, 2025

/cc @stbenjam @bertinatto

@openshift-ci openshift-ci bot requested review from bertinatto and stbenjam August 4, 2025 18:53
@smg247 smg247 force-pushed the remove-annotation-framework branch from b267d48 to b7e0cf6 Compare August 4, 2025 19:59
@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 smg247 force-pushed the remove-annotation-framework branch from b7e0cf6 to e367c47 Compare August 5, 2025 11:16
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 5, 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.

@smg247 smg247 force-pushed the remove-annotation-framework branch from e367c47 to 332a816 Compare August 5, 2025 11:26
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 5, 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 OpenShift CI
Copy link

openshift-ci bot commented Aug 5, 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-ovn-techpreview-serial e367c47 link false /test e2e-aws-ovn-techpreview-serial
ci/prow/e2e-agnostic-ovn-cmd e367c47 link false /test e2e-agnostic-ovn-cmd
ci/prow/e2e-gcp-ovn-upgrade e367c47 link true /test e2e-gcp-ovn-upgrade
ci/prow/e2e-azure e367c47 link false /test e2e-azure
ci/prow/k8s-e2e-gcp-ovn e367c47 link true /test k8s-e2e-gcp-ovn
ci/prow/unit e367c47 link true /test unit
ci/prow/e2e-openstack-csi-cinder e367c47 link false /test e2e-openstack-csi-cinder
ci/prow/okd-scos-images e367c47 link true /test okd-scos-images
ci/prow/e2e-aws-ovn-fips e367c47 link true /test e2e-aws-ovn-fips
ci/prow/e2e-aws-single-node e367c47 link false /test e2e-aws-single-node
ci/prow/okd-scos-e2e-aws-ovn e367c47 link false /test okd-scos-e2e-aws-ovn
ci/prow/k8s-e2e-conformance-aws e367c47 link true /test k8s-e2e-conformance-aws
ci/prow/e2e-openstack-csi-manila e367c47 link false /test e2e-openstack-csi-manila
ci/prow/e2e-vsphere e367c47 link false /test e2e-vsphere
ci/prow/e2e-aws-ovn-hypershift e367c47 link true /test e2e-aws-ovn-hypershift
ci/prow/e2e-metal-ipi-ovn-dualstack e367c47 link false /test e2e-metal-ipi-ovn-dualstack
ci/prow/k8s-e2e-gcp-serial e367c47 link true /test k8s-e2e-gcp-serial
ci/prow/verify-commits e367c47 link true /test verify-commits
ci/prow/e2e-aws-disruptive e367c47 link false /test e2e-aws-disruptive
ci/prow/e2e-aws-ovn-serial e367c47 link true /test e2e-aws-ovn-serial
ci/prow/e2e-gcp e367c47 link true /test e2e-gcp
ci/prow/images e367c47 link true /test images
ci/prow/e2e-aws-ovn-techpreview e367c47 link false /test e2e-aws-ovn-techpreview
ci/prow/verify e367c47 link true /test verify
ci/prow/e2e-metal-ipi-ovn-ipv6 e367c47 link false /test e2e-metal-ipi-ovn-ipv6
ci/prow/configmap-scale e367c47 link true /test configmap-scale
ci/prow/k8s-e2e-gcp-five-control-plane-replicas e367c47 link false /test k8s-e2e-gcp-five-control-plane-replicas

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.

@smg247
Copy link
Member Author

smg247 commented Aug 5, 2025

/payload 4.20 nightly blocking

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Aug 5, 2025

@smg247: trigger 10 job(s) of type blocking for the nightly release of OCP 4.20

  • periodic-ci-openshift-release-master-ci-4.20-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-upgrade-fips
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.20-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-bm
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/45b13850-71ef-11f0-85ad-d5e24f645146-0

@stbenjam
Copy link
Member

stbenjam commented Aug 5, 2025

I believe you need to keep [Suite:k8s], or we need to figure out why its not properly identifying kube tests in origin https://github.com/openshift/origin/blob/main/pkg/test/extensions/binary.go#L95-L98

@stbenjam
Copy link
Member

stbenjam commented Aug 5, 2025

I think you'll end up running every test 2x once it gets vendored in origin. You could test by vendoring this in origin and testing the two PR's together

@smg247
Copy link
Member Author

smg247 commented Aug 5, 2025

It's actually going to require an origin change anyways due to this.

@smg247
Copy link
Member Author

smg247 commented Aug 5, 2025

/hold openshift/origin relies on this framework for its own annotations, those will need to be removed before this goes in

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benluddy benluddy Awaiting requested review from benluddy

@jerpeter1 jerpeter1 Awaiting requested review from jerpeter1

@bertinatto bertinatto Awaiting requested review from bertinatto

@stbenjam stbenjam Awaiting requested review from stbenjam

Assignees
No one assigned
Labels
backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@smg247 @openshift-ci-robot @stbenjam @openshift-merge-robot