INTEROP-9415: Remove non-interop test steps from OPP CI configs by amp-rh · Pull Request #83356 · openshift/release

amp-rh · 2026-08-12T20:21:58Z

TL;DR

Pure deletion PR: removes 3 non-interop test steps and their orphaned dependencies from all 6 OPP interop jobs. No new code, no behavior changes to remaining steps. Each removed step is already validated by its product's own CI.

What changed

Steps removed from test: sections:

Step	Removed From	Why it's not interop
`acm-tests-grc`	3 AWS jobs	Pure ACM GRC policy testing; covered by stolostron CI
`acm-tests-alc`	3 AWS jobs	Pure ACM UI lifecycle testing; covered by stolostron CI
`openshift-extended-test`	3 AWS + 3 vSphere jobs	Pure OCP Cluster_Observability; covered by OCP CI

Orphaned config also removed:

Type	Items	Why orphaned
`base_images`	`acmqe-grc-test`, `console-e2e`, `tests-private`	Only consumed by removed steps (`from:` field in step refs)
`env` vars	`TEST_IMPORTANCE`, `TEST_SCENARIOS`	Only consumed by `openshift-extended-test`

Review guide

All 3 files have identical removals (symmetric across OCP versions). Reviewing one file covers the full change. Start with:

Core file (review this, the other two are identical):

ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22.yaml (-20 lines)

Confirm-identical files:

stolostron-policy-collection-main__ocp5.0.yaml (-20 lines)
stolostron-policy-collection-main__ocp5.1.yaml (-20 lines)

What stays

All interop-relevant steps remain: acm-policies-openshift-plus, acm-tests-clc-create, acm-opp-app, interop-tests-ocs-tests, quay-tests-quay-interop-test, acm-tests-observability, and the install/health-check chains.

Risk areas

Low risk. This is purely subtractive; no logic changes, no new steps.
IGNORE_SECONDARY_POLICIES env var is NOT removed; it's consumed by acm-policies-openshift-plus (not by any removed step).
clc-ui-e2e base image is NOT removed; it's consumed by acm-tests-clc-create.
No make update changes needed (step refs resolved at runtime by ci-operator).

Testing

Prow rehearsals ran for all 3 config variants (AWS + vSphere per version).
Verified remaining steps are unchanged by diffing the test: sections before/after.
Confirmed removed base_images have no other consumers in these configs.

Jira

INTEROP-9415 (Remove non-interop test steps from OPP CI configs)
Parent: INTEROP-9323 (Achieve 90%+ stability for OPP interop-only test suites)

openshift-ci-robot · 2026-08-12T20:22:01Z

@amp-rh: This pull request references INTEROP-9415 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 task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

Remove acm-tests-grc, acm-tests-alc, and openshift-extended-test step refs from all OPP interop job configs (OCP 4.22, 5.0, 5.1)

These single-product test steps don't meet the interop definition and are already validated by each product's own CI (stolostron CI for ACM steps, OCP CI for openshift-extended-test)

Also removes orphaned base_images (acmqe-grc-test, tests-private) and env vars (TEST_IMPORTANCE, TEST_SCENARIOS) that only served the removed steps

Steps removed

Step Removed From Rationale

acm-tests-grc AWS jobs Pure ACM GRC policy testing; covered by stolostron CI

acm-tests-alc AWS jobs Pure ACM UI lifecycle testing; covered by stolostron CI

openshift-extended-test AWS + vSphere jobs Pure OCP Cluster_Observability; covered by OCP CI

Config files modified

All under ci-operator/config/stolostron/policy-collection/:

stolostron-policy-collection-main__ocp4.22.yaml

stolostron-policy-collection-main__ocp5.0.yaml

stolostron-policy-collection-main__ocp5.1.yaml

Jira: INTEROP-9415
Parent: INTEROP-9323 (Achieve 90%+ stability for OPP interop-only test suites)

/cc @CSPI-QE

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 · 2026-08-12T20:22:02Z

@amp-rh: GitHub didn't allow me to request PR reviews from the following users: CSPI-QE.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

Summary

Remove acm-tests-grc, acm-tests-alc, and openshift-extended-test step refs from all OPP interop job configs (OCP 4.22, 5.0, 5.1)

These single-product test steps don't meet the interop definition and are already validated by each product's own CI (stolostron CI for ACM steps, OCP CI for openshift-extended-test)

Also removes orphaned base_images (acmqe-grc-test, tests-private) and env vars (TEST_IMPORTANCE, TEST_SCENARIOS) that only served the removed steps

Steps removed

Step Removed From Rationale

acm-tests-grc AWS jobs Pure ACM GRC policy testing; covered by stolostron CI

acm-tests-alc AWS jobs Pure ACM UI lifecycle testing; covered by stolostron CI

openshift-extended-test AWS + vSphere jobs Pure OCP Cluster_Observability; covered by OCP CI

Config files modified

All under ci-operator/config/stolostron/policy-collection/:

stolostron-policy-collection-main__ocp4.22.yaml

stolostron-policy-collection-main__ocp5.0.yaml

stolostron-policy-collection-main__ocp5.1.yaml

Jira: INTEROP-9415
Parent: INTEROP-9323 (Achieve 90%+ stability for OPP interop-only test suites)

/cc @CSPI-QE

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.

coderabbitai · 2026-08-12T20:22:29Z

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: Pro Plus

Run ID: 4555b2ae-f9f5-46b8-b02a-3b921afc25f7

📥 Commits

Reviewing files that changed from the base of the PR and between c53b104 and 36ddfe9.

📒 Files selected for processing (3)

ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22.yaml
ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml
ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1.yaml

💤 Files with no reviewable changes (3)

ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1.yaml
ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml
ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22.yaml

Walkthrough

The policy-collection configurations for OCP 4.22, 5.0, and 5.1 remove obsolete base images, test environment variables, and interop test-suite references from AWS and vSphere jobs.

Changes

Interop configuration cleanup

Layer / File(s)	Summary
Remove obsolete base images `ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22.yaml`, `ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml`, `ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1.yaml`	The configurations remove the `acmqe-grc-test` and `tests-private` base-image definitions.
Trim interop job settings and tests `ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22.yaml`, `ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml`, `ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1.yaml`	AWS and vSphere jobs no longer define `TEST_IMPORTANCE` or `TEST_SCENARIOS`. AWS no longer references GRC, ALC, or OpenShift extended tests. vSphere no longer references OpenShift extended tests.

Estimated code review effort: 1 (Trivial) | ~5 minutes

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
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	The PR diff only deletes YAML base-image, environment, and step-ref entries; it adds no Ginkgo test titles or dynamic values.
Test Structure And Quality	✅ Passed	The commit changes only three ci-operator YAML files, deleting step and environment references; it adds no Ginkgo It blocks or cluster-test code to assess.
Microshift Test Compatibility	✅ Passed	The diff contains only 48 YAML deletions in three CI configs; it adds no Ginkgo e2e tests or test code to assess for MicroShift compatibility.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	The parent-to-HEAD diff changes only three YAML CI configs and removes entries; it adds no Ginkgo e2e tests or multi-node assumptions.
Topology-Aware Scheduling Compatibility	✅ Passed	The PR changes only three CI YAML files and removes test refs, env vars, and base images; the diff adds no deployment manifests or topology-related scheduling constraints.
Ote Binary Stdout Contract	✅ Passed	The PR changes only three YAML CI configurations; it adds no OTE source, process-level code, or stdout/logging writes.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	The commit only deletes YAML test-step references, environment variables, and base images; it adds no Ginkgo tests, IPv4 assumptions, or external connectivity requirements.
No-Weak-Crypto	✅ Passed	The parent-to-HEAD diff contains only 48 deletions in three YAML configs and adds no MD5, SHA1, DES, RC4, Blowfish, ECB, crypto, or secret-comparison logic.
Container-Privileges	✅ Passed	The PR diff is deletion-only and adds no privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, allowPrivilegeEscalation, or root-execution settings.
No-Sensitive-Data-In-Logs	✅ Passed	The parent-to-HEAD diff contains 48 deletions and no additions. It removes test refs, environment variables, and base images, with no new logging or sensitive-data output.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly describes the removal of non-interop test steps from the OPP CI configurations.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

openshift-ci · 2026-08-12T20:22:44Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

Details

Needs approval from an approver in each of these files:

ci-operator/config/stolostron/policy-collection/OWNERS

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

openshift-merge-bot · 2026-08-12T20:57:55Z

[REHEARSALNOTIFIER]
@amp-rh: 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-stolostron-policy-collection-main-ocp5.1-images	stolostron/policy-collection	presubmit	Ci-operator config changed
pull-ci-stolostron-policy-collection-main-ocp5.0-images	stolostron/policy-collection	presubmit	Ci-operator config changed
pull-ci-stolostron-policy-collection-main-ocp4.22-images	stolostron/policy-collection	presubmit	Ci-operator config changed
periodic-ci-stolostron-policy-collection-main-ocp5.1-upgrade-interop-opp-upgrade-aws	N/A	periodic	Ci-operator config changed
periodic-ci-stolostron-policy-collection-main-ocp5.0-interop-opp-aws	N/A	periodic	Ci-operator config changed
periodic-ci-stolostron-policy-collection-main-ocp5.0-interop-opp-vsphere	N/A	periodic	Ci-operator config changed
periodic-ci-stolostron-policy-collection-main-ocp4.22-upgrade-interop-opp-upgrade-aws	N/A	periodic	Ci-operator config changed
periodic-ci-stolostron-policy-collection-main-ocp4.22-interop-opp-vsphere	N/A	periodic	Ci-operator config changed
periodic-ci-stolostron-policy-collection-main-ocp5.1-interop-opp-vsphere	N/A	periodic	Ci-operator config changed
periodic-ci-stolostron-policy-collection-main-ocp5.0-upgrade-interop-opp-upgrade-aws	N/A	periodic	Ci-operator config changed
periodic-ci-stolostron-policy-collection-main-ocp4.22-interop-opp-aws	N/A	periodic	Ci-operator config changed
periodic-ci-stolostron-policy-collection-main-ocp5.1-interop-opp-aws	N/A	periodic	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.

amp-rh · 2026-08-13T14:00:38Z

/pj-rehearse skip

openshift-merge-bot · 2026-08-13T14:01:50Z

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

amp-rh · 2026-08-13T14:07:55Z

/cc @cspi-qe-ocp-lp

Remove acm-tests-grc, acm-tests-alc, and openshift-extended-test from OPP interop job configurations across OCP 4.22, 5.0, and 5.1. These single-product test steps don't meet the interop definition and are already validated by each product's own CI: - acm-tests-grc: pure ACM GRC policy testing (stolostron CI) - acm-tests-alc: pure ACM UI lifecycle testing (stolostron CI) - openshift-extended-test: pure OCP Cluster_Observability (OCP CI) Also removes orphaned base_images (acmqe-grc-test, console-e2e, tests-private) and env vars (TEST_IMPORTANCE, TEST_SCENARIOS) that only served the removed steps. INTEROP-9415

openshift-merge-bot · 2026-08-13T14:19:22Z

@amp-rh: pj-rehearse could not automatically process this event because the request waited in queue for longer than 5 minutes. Use /pj-rehearse to trigger rehearsals manually.

openshift-ci · 2026-08-13T14:32:02Z

@amp-rh: all tests passed!

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.

amp-rh · 2026-08-13T17:56:33Z

Note: This PR is also included in combined PR #83405, which bundles all 8 OPP Q3 pipeline improvements into a single review target. Either this PR or #83405 can be merged (not both).

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 12, 2026

openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Aug 13, 2026

amp-rh force-pushed the interop-9415-remove-non-interop-steps branch from d7f6f9e to 3aea51b Compare August 13, 2026 14:14

amp-rh mentioned this pull request Aug 13, 2026

OPP Q3 Batch: Combined interop pipeline improvements #83405

Open

Uh oh!

Conversation

amp-rh commented Aug 12, 2026 • edited by atlassian Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

TL;DR

What changed

Review guide

What stays

Risk areas

Testing

Jira

Uh oh!

openshift-ci-robot commented Aug 12, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Steps removed

Config files modified

Uh oh!

openshift-ci Bot commented Aug 12, 2026 • edited by atlassian Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Steps removed

Config files modified

Uh oh!

coderabbitai Bot commented Aug 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Uh oh!

openshift-ci Bot commented Aug 12, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 12, 2026

Uh oh!

amp-rh commented Aug 13, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 13, 2026

Uh oh!

amp-rh commented Aug 13, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

amp-rh commented Aug 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

amp-rh commented Aug 12, 2026 •

edited by atlassian Bot

Loading

openshift-ci-robot commented Aug 12, 2026 •

edited by openshift-ci Bot

Loading

openshift-ci Bot commented Aug 12, 2026 •

edited by atlassian Bot

Loading

coderabbitai Bot commented Aug 12, 2026 •

edited

Loading