Skip to content

Conversation

@smg247
Copy link
Member

@smg247 smg247 commented Mar 31, 2025

As part of the deprecation and removal of the annotation framework, we must allow test-kubernetes-e2e.sh to retain current functionality without relying on the annotations. In order to do this, we can rely on the OTE binary's list tests command to get the spec names and their labels. This is possible because the specs have been updated here to also include the reason why they are being skipped as a label, alongside adding the environmentSelector. These labels will be appended to the spec name for only the purpose of determining if a test should be skipped in the script.

@openshift-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Mar 31, 2025
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 31, 2025
@openshift-ci
Copy link

openshift-ci bot commented Mar 31, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@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.

@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.

@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 changed the title WIP: PoC to use OTE generated labels for skips in test-kubernetes-e2e.sh Use OTE generated labels for skips in test-kubernetes-e2e.sh Apr 2, 2025
@smg247 smg247 marked this pull request as ready for review April 2, 2025 19:31
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 2, 2025
@openshift-ci openshift-ci bot requested review from bertinatto and jerpeter1 April 2, 2025 19:32
@smg247
Copy link
Member Author

smg247 commented Apr 2, 2025

/hold for #2254 and #2256

@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 Apr 2, 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 changed the title Use OTE generated labels for skips in test-kubernetes-e2e.sh TRT-2066: Use OTE generated labels for skips in test-kubernetes-e2e.sh Apr 3, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 3, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 3, 2025

@smg247: This pull request references TRT-2066 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.19.0" version, but no target version was set.

In response to this:

As part of the deprecation and removal of the annotation framework, we must allow test-kubernetes-e2e.sh to retain current functionality without relying on the annotations. In order to do this, we can rely on the OTE binary's list tests command to get the spec names and their labels. This is possible because the specs have been updated here to also include the reason why they are being skipped as a label, alongside adding the environmentSelector. These labels will then be stored in a map from the spec name to the labels in a generated file. This map will then be appended to the spec name for only the purpose of determining if a test should be skipped in the script.

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

smg247 commented Apr 4, 2025

/test verify

2 similar comments
@smg247
Copy link
Member Author

smg247 commented Apr 4, 2025

/test verify

@smg247
Copy link
Member Author

smg247 commented Apr 4, 2025

/test verify

@smg247
Copy link
Member Author

smg247 commented Apr 7, 2025

/retest-required

jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Aug 6, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Aug 9, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Aug 12, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Aug 15, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Aug 21, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Aug 24, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Aug 27, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Aug 30, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Sep 8, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Sep 15, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Sep 16, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Sep 18, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Sep 19, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Sep 24, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Sep 24, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Sep 25, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Sep 25, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
bertinatto pushed a commit to bertinatto/kubernetes that referenced this pull request Oct 1, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Oct 1, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
bertinatto pushed a commit to bertinatto/kubernetes that referenced this pull request Oct 2, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Oct 2, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
bertinatto pushed a commit to bertinatto/kubernetes that referenced this pull request Oct 6, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
bertinatto pushed a commit to bertinatto/kubernetes that referenced this pull request Oct 6, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
bertinatto pushed a commit to bertinatto/kubernetes that referenced this pull request Oct 7, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
bertinatto pushed a commit to bertinatto/kubernetes that referenced this pull request Oct 8, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
bertinatto pushed a commit to bertinatto/kubernetes that referenced this pull request Oct 9, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
bertinatto pushed a commit to bertinatto/kubernetes that referenced this pull request Oct 14, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
bertinatto pushed a commit to bertinatto/kubernetes that referenced this pull request Oct 15, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Nov 20, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
jacobsee pushed a commit to jacobsee/kubernetes that referenced this pull request Nov 24, 2025
…force 2nd labeling to make tests work

The original carry patch modified openshift-hack/e2e/kube_e2e_test.go,
but those changes were dropped in OCP 4.20 (Kubernetes 1.33) in favor of
the updated implementation from:

openshift#2255

That PR was squashed into the tooling commit:

UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants