Skip to content

INTEROP-9450: Fix OPP preflight compat matrix for OCP 5.0 and 5.1 - #85225

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
redhat-chai-bot:interop-fix-odf-compat-matrix
Sep 20, 2026
Merged

openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
redhat-chai-bot:interop-fix-odf-compat-matrix

Conversation

@redhat-chai-bot

@redhat-chai-bot redhat-chai-bot commented Sep 15, 2026 •

Copy link
Copy Markdown
Contributor

Summary

Fixes the OPP preflight compatibility matrix so that OCP 5.0 and 5.1 interop jobs are not blocked by missing or unavailable operator versions.

Changes

OCP 5.0 row — lower odf-operator from 5.0 to 4.22 (ODF 5.0 is not yet available).

OCP 5.1 row — remove odf-operator and rhacs-operator (neither is in the 5.1 catalog at all; the preflight gate marks NOT INSTALLED operators as failures), and lower quay-operator from 3.18 to 3.17 (only 3.17.4 is available).

Before:

OPP_COMPAT["5.0"]="advanced-cluster-management:2.17 quay-operator:3.17 odf-operator:5.0 rhacs-operator:4.11"
OPP_COMPAT["5.1"]="advanced-cluster-management:2.17 quay-operator:3.18 odf-operator:5.1 rhacs-operator:4.12"

After:

OPP_COMPAT["5.0"]="advanced-cluster-management:2.17 quay-operator:3.17 odf-operator:4.22 rhacs-operator:4.11"
OPP_COMPAT["5.1"]="advanced-cluster-management:2.17 quay-operator:3.17"

Context

Jira: INTEROP-9450 / parent INTEROP-9329

@coderabbitai

coderabbitai Bot commented Sep 15, 2026 •

Copy link
Copy Markdown
Contributor

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: Advanced

Run ID: 34091b43-98ee-4385-a9b2-c83cb097352c

📥 Commits

Reviewing files that changed from the base of the PR and between 8f2e1dc and 7f1a121.

📒 Files selected for processing (1)
  • ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh

Included review availability: Your plan provides up to 2 included reviews per hour; 0 remain after this review.


Walkthrough

The OCP 5.0 OPP compatibility matrix now requires odf-operator version 4.22 instead of 5.0. Other operator minimums remain unchanged.

Changes

OPP compatibility

Layer / File(s) Summary
Update OCP 5.0 compatibility requirement
ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh
The OPP_COMPAT["5.0"] entry lowers the minimum odf-operator version from 5.0 to 4.22. Other operator minimums remain unchanged.

Priority: ⬇️ Low

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

Change: Bug fix

Suggested reviewers: amp-rh

Merge Risk: ⚪ Minimal · up to 7f1a1

The matrix now selects the ODF 4.22 channel for OCP 5.0, matching the available catalog channel. No concrete merge risk remains.

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 1 files. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (14 passed)
Check name Status Explanation
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 pull request changes only one compatibility-matrix value in a shell script: odf-operator:5.0 becomes odf-operator:4.22. The diff adds no Ginkgo tests or test-title constructs, and the changed …
Test Structure And Quality ✅ Passed PASS: The PR changes only one .sh file and updates the OPP_COMPAT["5.0"] data entry from odf-operator:5.0 to odf-operator:4.22. The changed file contains no Ginkgo test constructs such as It…
Microshift Test Compatibility ✅ Passed PASS. The pull request changes only one shell-script matrix value: odf-operator:5.0 to odf-operator:4.22. The authoritative diff contains no new Ginkgo e2e tests, so the MicroShift test-compatibil…
Single Node Openshift (Sno) Test Compatibility ✅ Passed The reviewed range changes one shell-script matrix value only: odf-operator:5.0 becomes odf-operator:4.22. No new Ginkgo tests or other test declarations were added, so the SNO compatibility check…
Topology-Aware Scheduling Compatibility ✅ Passed PASS: The pull request changes one shell-script compatibility-matrix value only. The diff adds no deployment manifest, operator code, controller, replica setting, affinity, topology spread, node selec…
Ote Binary Stdout Contract ✅ Passed PASS. The pull request changes one compatibility-matrix value in a CI shell step: odf-operator:5.0 becomes odf-operator:4.22. The diff does not add or change any stdout write, OTE binary, Go test …
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PASS: The pull request changes one line in a shell compatibility matrix. The authoritative diff contains no new Ginkgo tests, test files, IPv4 assumptions, or external connectivity. The IPv6 and disco…
No-Weak-Crypto ✅ Passed PASS. The PR changes only the OCP 5.0 operator compatibility value from odf-operator:5.0 to odf-operator:4.22. The changed content introduces no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom cr…
Container-Privileges ✅ Passed PASS: The pull request changes one line in a shell compatibility matrix. The changed file is not a container or Kubernetes manifest, and the diff introduces no privilege-related settings such as privi…
No-Sensitive-Data-In-Logs ✅ Passed PASS: The pull request changes only the OPP compatibility value from odf-operator:5.0 to odf-operator:4.22. The patch adds no logging, output, credentials, tokens, hostnames, PII, or customer data…
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the OPP preflight compatibility matrix fix and correctly references OCP 5.0, which is the main change. The OCP 5.1 reference is not supported by the changeset, but the tit…
  • Fix all pre-merge checks with AI
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@amp-rh

amp-rh commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

/assign

redhat-chai-bot pushed a commit to redhat-chai-bot/openshift_release that referenced this pull request Sep 15, 2026
redhat-chai-bot pushed a commit to redhat-chai-bot/openshift_release that referenced this pull request Sep 15, 2026
redhat-chai-bot pushed a commit to redhat-chai-bot/openshift_release that referenced this pull request Sep 16, 2026
redhat-chai-bot pushed a commit to redhat-chai-bot/openshift_release that referenced this pull request Sep 16, 2026
redhat-chai-bot added a commit to redhat-chai-bot/openshift_release that referenced this pull request Sep 16, 2026
redhat-chai-bot added a commit to redhat-chai-bot/openshift_release that referenced this pull request Sep 16, 2026
@redhat-chai-bot
redhat-chai-bot force-pushed the interop-fix-odf-compat-matrix branch 2 times, most recently from c4e7f80 to 674a4df Compare September 17, 2026 17:42
@amp-rh

amp-rh commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

/pj-rehearse periodic-ci-stolostron-policy-collection-main-ocp4.22-upgrade-interop-opp-upgrade-aws

@amp-rh

amp-rh commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

/retest

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@amp-rh: your /pj-rehearse request was not processed because the request waited in queue for longer than 5 minutes. Please retry in a few minutes.

@redhat-chai-bot

Copy link
Copy Markdown
Contributor Author

/retest


AI-generated. Review for accuracy.

redhat-chai-bot and others added 2 commits September 20, 2026 01:40
ODF uses stable-4.x channel versioning, not 5.x. The v5.0 operator
catalog only has stable-4.22 for ODF. Change odf-operator:5.0 to
odf-operator:4.22 in the OPP_COMPAT["5.0"] entry.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@redhat-chai-bot
redhat-chai-bot force-pushed the interop-fix-odf-compat-matrix branch from 674a4df to 6db9803 Compare September 20, 2026 01:43
@redhat-chai-bot redhat-chai-bot changed the title Fix ODF operator version in OPP preflight compat matrix for OCP 5.0 INTEROP-9450: Fix OPP preflight compat matrix for OCP 5.0 and 5.1 Sep 20, 2026
@openshift-ci-robot

openshift-ci-robot commented Sep 20, 2026 •

Copy link
Copy Markdown
Contributor

@redhat-chai-bot: This pull request references INTEROP-9450 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.1.0" version, but no target version was set.

Details

In response to this:

Summary

Fixes the OPP preflight compatibility matrix so that OCP 5.0 and 5.1 interop jobs are not blocked by missing or unavailable operator versions.

Changes

OCP 5.0 row — lower odf-operator from 5.0 to 4.22 (ODF 5.0 is not yet available).

OCP 5.1 row — remove odf-operator and rhacs-operator (neither is in the 5.1 catalog at all; the preflight gate marks NOT INSTALLED operators as failures), and lower quay-operator from 3.18 to 3.17 (only 3.17.4 is available).

Before:

OPP_COMPAT["5.0"]="advanced-cluster-management:2.17 quay-operator:3.17 odf-operator:5.0 rhacs-operator:4.11"
OPP_COMPAT["5.1"]="advanced-cluster-management:2.17 quay-operator:3.18 odf-operator:5.1 rhacs-operator:4.12"

After:

OPP_COMPAT["5.0"]="advanced-cluster-management:2.17 quay-operator:3.17 odf-operator:4.22 rhacs-operator:4.11"
OPP_COMPAT["5.1"]="advanced-cluster-management:2.17 quay-operator:3.17"

Context

Jira: INTEROP-9450 / parent INTEROP-9329

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 openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 20, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@redhat-chai-bot: 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
periodic-ci-stolostron-policy-collection-main-ocp4.22-upgrade-interop-opp-upgrade-aws N/A periodic Registry content changed
periodic-ci-stolostron-policy-collection-main-ocp5.0-upgrade-interop-opp-upgrade-aws N/A periodic Registry content changed
periodic-ci-stolostron-policy-collection-main-ocp5.1-upgrade-interop-opp-upgrade-aws N/A periodic Registry content 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.

@openshift-ci

openshift-ci Bot commented Sep 20, 2026

Copy link
Copy Markdown
Contributor

@redhat-chai-bot: 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

amp-rh commented Sep 20, 2026

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 20, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 20, 2026
@openshift-ci

openshift-ci Bot commented Sep 20, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amp-rh, redhat-chai-bot

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

@amp-rh

amp-rh commented Sep 20, 2026

Copy link
Copy Markdown
Contributor

/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@amp-rh: 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 Sep 20, 2026
@openshift-merge-bot
openshift-merge-bot Bot merged commit 97d57a7 into openshift:main Sep 20, 2026
12 checks passed
jtaleric pushed a commit to jtaleric/release that referenced this pull request Sep 23, 2026
…enshift#85225)

* Fix ODF operator version in OPP preflight compat matrix for 5.0

ODF uses stable-4.x channel versioning, not 5.x. The v5.0 operator
catalog only has stable-4.22 for ODF. Change odf-operator:5.0 to
odf-operator:4.22 in the OPP_COMPAT["5.0"] entry.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Also fix OPP_COMPAT 5.1 row: remove unavailable operators

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
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. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants