Skip to content

OPRUN-4607: Remove test-experimental-e2e from techpreview#79473

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
tmshort:remove-experimental-e2e
May 20, 2026
Merged

OPRUN-4607: Remove test-experimental-e2e from techpreview#79473
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
tmshort:remove-experimental-e2e

Conversation

@tmshort
Copy link
Copy Markdown
Contributor

@tmshort tmshort commented May 19, 2026

When running the openshift-e2e-aws-techpreview CI, both the test-e2e and test-experimental-e2e targets are run. This is redundant, as the upstream e2e looks at the enabled feature flags to determine which tests to run. So, the test-experimental-e2e wasn't doing anything special.

This now just runs the test-e2e target.

Summary

This PR updates the OpenShift CI configuration for the operator-framework-operator-controller component (ci-operator configs in the openshift/release repo) so the optional openshift-e2e-aws-techpreview job runs only the upstream test-e2e make target. The redundant invocation of make -C openshift test-experimental-e2e was removed; the job now invokes make -C openshift test-e2e exclusively.

Rationale

The upstream e2e harness controls which tests run via feature flags (FEATURE_SET: TechPreviewNoUpgrade). test-experimental-e2e provided no additional behavior, so running both targets was redundant.

Affected configuration

ci-operator configs modified for the operator-framework-operator-controller component:

  • openshift-operator-framework-operator-controller-main.yaml
  • openshift-operator-framework-operator-controller-release-4.23.yaml
  • openshift-operator-framework-operator-controller-release-5.0.yaml
  • openshift-operator-framework-operator-controller-release-5.1.yaml

Each file’s openshift-e2e-aws-techpreview optional step was changed to run make -C openshift test-e2e instead of make -C openshift test-experimental-e2e.

Impact

Pure CI configuration change; no API, production code, or exported/public interface changes. The CI job will continue to run E2E tests under the same cluster profile and FEATURE_SET, with the duplicate experimental target removed.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 19, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented May 19, 2026

@tmshort: This pull request references OPRUN-4607 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 "5.0.0" version, but no target version was set.

Details

In response to this:

When running the openshift-e2e-aws-techpreview CI, both the test-e2e and test-experimental-e2e targets are run. This is redundant, as the upstream e2e looks at the enabled feature flags to determine which tests to run. So, the test-experimental-e2e wasn't doing anything special.

This now just runs the test-e2e target.

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 openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 19, 2026
@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 19, 2026

/pj-rehearse auto-ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 19, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 7c9a2d4e-707c-4c58-b7bb-5559704b8233

📥 Commits

Reviewing files that changed from the base of the PR and between fda6e21 and c3479e3.

📒 Files selected for processing (4)
  • ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml
  • ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.23.yaml
  • ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-5.0.yaml
  • ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-5.1.yaml
💤 Files with no reviewable changes (4)
  • ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml
  • ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-5.1.yaml
  • ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.23.yaml
  • ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-5.0.yaml

Walkthrough

Four CI operator configuration files for the operator-framework-operator-controller project are updated to run the standard E2E test suite instead of the experimental variant in the Tech Preview workflow step across main and release branches 4.23, 5.0, and 5.1.

Changes

E2E test target update

Layer / File(s) Summary
Update E2E test target across release branches
ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml, ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.23.yaml, ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-5.0.yaml, ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-5.1.yaml
The openshift-e2e-aws-techpreview job's E2E make command is changed from make -C openshift test-experimental-e2e to make -C openshift test-e2e in all four release branch configurations. Step structure, dependencies, cluster profiles, and FEATURE_SET environment variables remain unchanged.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Suggested reviewers

  • ifireball
  • psturc

Suggested labels

lgtm, rehearsals-ack

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely summarizes the main change: removing test-experimental-e2e from techpreview workflows across four CI configuration files.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR changes CI config YAML files only. Custom check applies to Ginkgo test code definitions (It(), Describe(), etc.). No test code is modified in this PR.
Test Structure And Quality ✅ Passed PR modifies only CI configuration YAML files, not Ginkgo test code. The custom check requires review of test code structure. Since the PR contains no test code, the check is not applicable.
Microshift Test Compatibility ✅ Passed This PR is not applicable to the check. It only modifies CI workflow configuration files, not test code. No new Ginkgo e2e tests are being added, which is the prerequisite for the check.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR is a CI configuration change only. It does not add any new Ginkgo e2e tests. The check applies only when new tests are added, which is not the case here.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies CI configuration files only (ci-operator YAML), not deployment manifests, operator code, or controllers. The topology-aware scheduling check is explicitly scoped to those artifact types.
Ote Binary Stdout Contract ✅ Passed PR modifies only CI configuration YAML files, not source code. The OTE Binary Stdout Contract check is applicable to source code changes, not CI configuration changes. Not applicable to this PR.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR modifies only CI configuration YAML files, not test code. No Ginkgo tests (It, Describe, Context, When) are added. This check applies only to new test code additions.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@tmshort tmshort force-pushed the remove-experimental-e2e branch from fda6e21 to c3479e3 Compare May 19, 2026 13:33
@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 19, 2026

/pj-rehearse auto-ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@joelanford
Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 19, 2026
@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 19, 2026

The optional techpreview jobs may not pass until openshift/operator-framework-operator-controller#726 merges...

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 19, 2026

/jp-rehearse auto-ack

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 19, 2026

/pj-rehearse pull-ci-openshift-operator-framework-operator-controller-release-4.23-openshift-e2e-aws-techpreview
/pj-rehearse pull-ci-openshift-operator-framework-operator-controller-main-openshift-e2e-aws-techpreview
/pj-rehearse pull-ci-openshift-operator-framework-operator-controller-release-5.1-openshift-e2e-aws-techpreview
/pj-rehearse pull-ci-openshift-operator-framework-operator-controller-release-5.0-openshift-e2e-aws-techpreview

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command.

2 similar comments
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command.

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 20, 2026

/pj-rehearse pull-ci-openshift-operator-framework-operator-controller-main-openshift-e2e-aws-techpreview
/pj-rehearse pull-ci-openshift-operator-framework-operator-controller-release-5.1-openshift-e2e-aws-techpreview
/pj-rehearse pull-ci-openshift-operator-framework-operator-controller-release-5.0-openshift-e2e-aws-techpreview

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command.

1 similar comment
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command.

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 20, 2026

/pj-rehearse pull-ci-openshift-operator-framework-operator-controller-release-5.1-openshift-e2e-aws-techpreview

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 20, 2026

/pj-rehearse pull-ci-openshift-operator-framework-operator-controller-release-5.0-openshift-e2e-aws-techpreview

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

When running the openshift-e2e-aws-techpreview CI, both the test-e2e and
test-experimental-e2e targets are run. This is redundant, as the upstream
e2e looks at the enabled feature flags to determine which tests to run.
So, the test-experimental-e2e wasn't doing anything special.

This now just runs the test-e2e target.

Signed-off-by: Todd Short <todd.short@me.com>
@tmshort tmshort force-pushed the remove-experimental-e2e branch from c3479e3 to 8f89bb1 Compare May 20, 2026 13:05
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label May 20, 2026
@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 20, 2026

/pj-rehearse auto-ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@tmshort: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-operator-framework-operator-controller-release-5.1-openshift-e2e-aws-techpreview openshift/operator-framework-operator-controller presubmit Ci-operator config changed
pull-ci-openshift-operator-framework-operator-controller-release-4.23-openshift-e2e-aws-techpreview openshift/operator-framework-operator-controller presubmit Ci-operator config changed
pull-ci-openshift-operator-framework-operator-controller-release-5.0-openshift-e2e-aws-techpreview openshift/operator-framework-operator-controller presubmit Ci-operator config changed
pull-ci-openshift-operator-framework-operator-controller-main-openshift-e2e-aws-techpreview openshift/operator-framework-operator-controller presubmit Ci-operator config changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 20, 2026

The upstream-e2e passed in main/4.23/5.0. The install failed in 5.1, not an issue with my changes.

@bandrade
Copy link
Copy Markdown
Contributor

/label qe-approved
/verified by @bandrade

@openshift-ci openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label May 20, 2026
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 20, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@bandrade: This PR has been marked as verified by @bandrade.

Details

In response to this:

/label qe-approved
/verified by @bandrade

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.

Copy link
Copy Markdown
Contributor

@pedjak pedjak left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 20, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelanford, pedjak, rashmigottipati, tmshort

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

The pull request process is described here

Details 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

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 20, 2026

/pj-rehearse ack
The upstream-e2e passed in main/4.23/5.0. The install failed in 5.1, not an issue with my changes.
The main version eventually failed due to:

: [sig-cli] oc adm must-gather runs successfully for audit logs [apigroup:config.openshift.io][apigroup:oauth.openshift.io] [Suite:openshift/conformance/parallel] 

But it had passed the upstream-e2e, which is the area of change here.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 20, 2026
@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 20, 2026

/override ci/rehearse/openshift/operator-framework-operator-controller/main/openshift-e2e-aws-techpreview

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 20, 2026

/override ci/rehearse/openshift/operator-framework-operator-controller/release-5.1/openshift-e2e-aws-techpreview

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 20, 2026

@tmshort: tmshort unauthorized: /override is restricted to Repo administrators, approvers in top level OWNERS file, and the following github teams:openshift: openshift-release-oversight openshift-staff-engineers openshift-sustaining-engineers.

Details

In response to this:

/override ci/rehearse/openshift/operator-framework-operator-controller/main/openshift-e2e-aws-techpreview

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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 20, 2026

@tmshort: tmshort unauthorized: /override is restricted to Repo administrators, approvers in top level OWNERS file, and the following github teams:openshift: openshift-release-oversight openshift-staff-engineers openshift-sustaining-engineers.

Details

In response to this:

/override ci/rehearse/openshift/operator-framework-operator-controller/release-5.1/openshift-e2e-aws-techpreview

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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 20, 2026

@tmshort: 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/rehearse/openshift/operator-framework-operator-controller/release-5.1/openshift-e2e-aws-techpreview 8f89bb1 link unknown /pj-rehearse pull-ci-openshift-operator-framework-operator-controller-release-5.1-openshift-e2e-aws-techpreview
ci/rehearse/openshift/operator-framework-operator-controller/main/openshift-e2e-aws-techpreview 8f89bb1 link unknown /pj-rehearse pull-ci-openshift-operator-framework-operator-controller-main-openshift-e2e-aws-techpreview

Full PR test history. Your PR dashboard.

Details

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.

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented May 20, 2026

/pj-rehearse ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@tmshort: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot merged commit 6ad0dd9 into openshift:main May 20, 2026
16 of 18 checks passed
@tmshort tmshort deleted the remove-experimental-e2e branch May 20, 2026 20:03
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. 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. qe-approved Signifies that QE has signed off on this PR rehearsals-ack Signifies that rehearsal jobs have been acknowledged verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants