INTEROP-9357: Point OPP observability tests at maintained main branch - #82365
Conversation
|
@amp-rh: This pull request references INTEROP-9357 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. DetailsIn response to this:
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. |
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
WalkthroughAdds an OPP ChangesOPP main image integration
Estimated code review effort: 2 (Simple) | ~10 minutes Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
CI Config Verification —
|
|
/pj-rehearse |
|
@amp-rh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
Rehearsal Failure AnalysisThe two failing rehearsal jobs are expected failures due to a chicken-and-egg dependency — not indicative of a problem with the PR. Failed Jobs
Root CauseBoth jobs fail with the same error at the ci-operator attempted to import the base image Why This Is ExpectedThis PR simultaneously:
The consumer rehearsals (the failing jobs) now point at Successful RehearsalsThe three passing rehearsals confirm the new configurations are valid:
Analysis by Chai Bot |
69de535 to
9accc13
Compare
|
/pj-rehearse |
|
@amp-rh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse ack |
|
/auto-cc |
|
@amp-rh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse ack |
|
@amp-rh: your |
|
/pj-rehearse ack |
|
@amp-rh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
Code ReviewReviewed the full diff (8 files, +174 / −25). The change is well-motivated, well-structured, and low-risk. A few observations below. Overall Assessment: ✅ Looks goodConsolidating on Specific Observations1. New ci-operator config ( 2. Consumer migrations — All four configs consistently switch from version-specific image stream names to 3. Generated job files — Postsubmit has 4. Preflight script changes — Good improvements:
5. Risk acknowledgment — The Go version mismatch ( 6. Rehearsal failures — The two consumer rehearsal failures ( Minor Note
Review by Chai Bot on behalf of a team member. |
|
@gparvin @ngraham20 @jan-law Friendly ping, all checks are green (rehearsals-ack applied) and this is ready for review. This points OPP observability tests at the maintained main branch to fix deprecated step references. |
Chai Bot ReviewOverall Assessment: ✅ Approach is soundConsolidating from unmaintained version-specific branches (
|
6ad5229 to
0629b0b
Compare
|
[REHEARSALNOTIFIER]
Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/retest ci/prow/config |
|
/retest-required |
|
/pj-rehearse ack |
|
@amp-rh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/auto-cc |
|
/approve |
|
/cc @bjoydeep |
|
/assign @bjoydeep |
|
/approve |
|
Hi 👋 — this PR has been review-ready with green CI for a while and just needs an @bjoydeep @thibaultmg @philipgough — could one of you take a quick look and Thank you! 🙏 AI-generated. Review for accuracy. |
|
@jacobbaungard or @saswatamcode @philipgough @subbarao-meduri You guys should probably review this :) |
|
/lgtm |
guidonguido
left a comment
There was a problem hiding this comment.
Hello @amp-rh, I only have a question regarding the consumer configs: why do they target acm-qe/2.17:multicluster-observability-operator-opp and not acm-qe/main:multicluster-observability-operator-opp?
| tag: fetch-managed-clusters | ||
| multicluster-observability-operator-opp: | ||
| name: "2.15" | ||
| name: "2.17" |
| tag: installer | ||
| multicluster-observability-operator-opp: | ||
| name: "2.16" | ||
| name: "2.17" |
| tag: fetch-managed-clusters | ||
| multicluster-observability-operator-opp: | ||
| name: "2.16" | ||
| name: "2.17" |
|
Good question. Looking at the Jira history (INTEROP-9357, ACM-38013), the consumer configs are pinned to |
|
I see, thank you @amiskin94 /lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: amiskin94, amp-rh, chaclark1974, coleenquadros, gparvin, guidonguido, vboulos The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
fccdda5
into
openshift:main
Problem
The
acm-tests-observabilitystep in OPP workflows builds its test image fromdeprecated, version-specific branches of
stolostron/multicluster-observability-operator (release-2.13 through release-2.16).
These branches are unmaintained for test development, and the deprecated test suite
has generated 6 spurious firewatch tickets since December 2025
(INTEROP-8656, ACM-32822, ACM-34163, ACM-34904, ACM-35122, ACM-38013).
The MCO team has confirmed that
mainis the actively maintained branch for thetest suite (see ACM-34163, ACM-34904, ACM-35122 comments).
Changes
New ci-operator config for
stolostron/multicluster-observability-operatormain__oppvariant — builds the OPP test image (Dockerfile.interop) frommainand promotes it to the
acm-qe/mainimage stream.Updated 4 consumer configs to source
multicluster-observability-operator-oppfrom
acm-qe/maininstead of version-specific streams:stolostron-policy-collection-main__ocp4.22.yaml(was2.16)stolostron-policy-collection-main__ocp5.0.yaml(was5.0)RedHatQE-interop-testing-master__acm-cnv-ocp-4.22-p2p.yaml(was2.16)RedHatQE-interop-testing-master__acm-cnv-ocp-4.21-p2p.yaml(was2.15)Generated Prow job files for the new
main__oppvariant (presubmits + postsubmits).Risk
The
Dockerfile.interopbase image is taggedgo1.21butgo.modonmainrequires Go 1.25. If the Quay base image has not been updated behind the tag,
the image build will fail in CI. A follow-up PR to
stolostron/multicluster-observability-operator to update
Dockerfile.interopwould then be needed.
Verification
make ci-operator-config✅make ci-operator-checkconfig✅make ci-operator-prowgen✅make sanitize-prow-jobs✅References
Summary by CodeRabbit
stolostron/multicluster-observability-operatormainimage stream for OCP 4.21, 4.22, and 5.0 configurations.main__oppbuild and promotion configuration for themulticluster-observability-operator-oppimage inacm-qe/main.4.14, with improved version parsing and reporting.