Acm sf multicloud operators foundation e2e fix

[tesshuflower]

Multicloud-operators-foundation previously used main in many places for image tags when deploying other components for e2e testing.

In some older release branches, some addon images would use the appropriate "branch-x.y" tag, but recent ones all default to main.

Additionally, ADDON_MANAGER_IMAGE was never specified, so it was actually falling back to the open-cluster-management-io image: quay.io/open-cluster-management/addon-manager:latest where other images would be set to the stolstron equivalent.

So fixes:

• Use the proper branch-x.y tag generally instead of hardcoding main. Note that main/backplane-5.0 still use main
• set ADDON_MANAGER_IMAGE so we're picking up the stolostron image.

Not fixed:

• the CLUSTER_PROXY image is still hardcoded to use the main tag - this fix will need to be done in https://github.com/stolostron/multicloud-operators-foundation/blob/89634a74478f2f2f1931730eb28ee9713651d7ce/deploy/managedcluster/addons/install.sh#L68 (across all branches)

Summary

This PR updates OpenShift CI configuration for the Stolostron multicloud-operators-foundation component so e2e jobs use branch-aligned Stolostron-built images instead of defaulting to :main (and fixes a missing addon-manager image).

Practical impact / scope

• Affects CI/Prow job definitions for stolostron/multicloud-operators-foundation under ci-operator/config/stolostron/multicloud-operators-foundation/.
• Ensures e2e tests for each release branch pull operator and component images tagged from the matching Stolostron branch, preventing cross-branch image skew during rehearsals and CI runs.

Problem addressed

• Many e2e jobs previously hardcoded or defaulted to :main (OCM_VERSION=main), causing tests for older release branches to pull main images instead of branch-specific images.
• ADDON_MANAGER_IMAGE was not explicitly set, causing a fallback to quay.io/open-cluster-management/addon-manager:latest rather than the Stolostron-built addon-manager.

Changes made

Updated the e2e step in the CI configs for the following jobs to derive image tags from a branch variable and explicitly export the addon-manager image:

• backplane-2.6
• backplane-2.7
• backplane-2.8
• backplane-2.9
• backplane-2.10
• backplane-2.11
• backplane-2.17
• backplane-5.0
• main

Concretely:

• Replaced OCM_VERSION=main usage with OCM_BRANCH= (e.g., OCM_BRANCH=backplane-2.10 or OCM_BRANCH=main).
• Set REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH.
• Constructed operator/component image references from quay.io/stolostron/*:$OCM_BRANCH (OPERATOR_IMAGE_NAME, REGISTRATION_IMAGE, WORK_IMAGE, PLACEMENT_IMAGE).
• Added ADDON_MANAGER_IMAGE=quay.io/stolostron/addon-manager:${OCM_BRANCH} and export it so tests use the Stolostron addon-manager image.
• Standardized renaming IMAGE_NAME → OPERATOR_IMAGE_NAME and adjusted exported variable lists.

Files updated: ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-{main,backplane-5.0,backplane-2.6,2.7,2.8,2.9,2.10,2.11,2.17}.yaml

Known limitations / notes

• CLUSTER_PROXY image remains hardcoded to main; that change must be made upstream in the multicloud-operators-foundation repository (deploy/managedcluster/addons/install.sh) across branches.
• backplane-5.0 now uses its branch tag (backplane-5.0) and main uses OCM_BRANCH=main as shown in the updated CI configs.

[coderabbitai]

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: dd58132e-ac7f-4d95-b83b-65eecd4ee6bd

📥 Commits

Reviewing files that changed from the base of the PR and between e7c6511 and ffb86b3.

📒 Files selected for processing (1)

• ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-5.0.yaml

---

Walkthrough

The PR updates CI config for multicloud-operators-foundation across nine branch variants (backplane-2.6–2.17, 5.0, and main) to replace OCM_VERSION=main with branch-specific OCM_BRANCH values, rename/operator image variables, and export consistent component image and branch variables.

Changes

E2E Image Tag Configuration Across Branch Variants

Layer / File(s)

Summary

Branch-specific image tagging and exports ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.{6,7,8,9,10,11,17}.yaml, ...-backplane-5.0.yaml, ...-main.yaml

E2E step: replace OCM_VERSION=main with OCM_BRANCH=<branch>; set REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH; build component image variables as quay.io/stolostron/<component>:$OCM_BRANCH (renaming IMAGE_NAME → OPERATOR_IMAGE_NAME and adding REGISTRATION_IMAGE, WORK_IMAGE, PLACEMENT_IMAGE, ADDON_MANAGER_IMAGE); update export to include KUBECTL, REGISTRATION_OPERATOR_BRANCH, OCM_BRANCH, and the component image variables.

Estimated Code Review Effort

🎯 2 (Simple) | ⏱️ ~10 minutes

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 references 'e2e fix' for multicloud-operators-foundation, which aligns with the primary change of updating CI e2e test configurations to use proper branch-aligned image tags.
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	This PR contains only YAML CI/CD configuration changes with no Ginkgo test definitions. The custom check for stable and deterministic test names is not applicable to this change.
Test Structure And Quality	✅ Passed	Custom check for Ginkgo test code quality is not applicable. This PR modifies only CI configuration YAML files (ci-operator/config), not test code. No Ginkgo test patterns found in modified files.
Microshift Test Compatibility	✅ Passed	No new Ginkgo e2e tests are added in this PR. All changes are CI configuration updates (YAML files) modifying environment variables and image tags, not test source code.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	This PR modifies CI configuration YAML files only. No new Ginkgo e2e tests are added, so SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	PR modifies only CI config files, not deployment manifests or operator code. Changes set environment variables and image tags for tests—no scheduling constraints introduced.
Ote Binary Stdout Contract	✅ Passed	PR modifies only CI configuration YAML files, not Go test code. Check not applicable.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PR modifies CI configuration YAML files only, not test code. No new Ginkgo tests (It(), Describe(), etc.) are added. The custom check applies only to new e2e tests.

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

• Generate code and open pull requests
• Plan features and break down work
• Investigate incidents and troubleshoot customer tickets together
• Automate recurring tasks and respond to alerts with triggers
• Summarize progress and report instantly

Built for teams:

• Shared memory across your entire org—no repeating context
• Per-thread sandboxes to safely plan and execute work
• Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[tesshuflower]

/pj-rehearse pull-ci-stolostron-multicloud-operators-foundation-backplane-2.17-e2e

[openshift-merge-bot]

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

[tesshuflower]

/pj-rehearse pull-ci-stolostron-multicloud-operators-foundation-main-e2e

[openshift-merge-bot]

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

[rokej]

#79265 seems a duplicate of this @tesshuflower @dhaiducek

[dhaiducek]

I'd still use backplane-5.0 here. It'll be more maintainable.

[tesshuflower]

Right, makes sense - was thinking 5.0 would have to be in sync with main for now, but no reason to

[dhaiducek]

/pj-rehearse pull-ci-stolostron-multicloud-operators-foundation-backplane-2.10-e2e

[openshift-merge-bot]

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

[openshift-merge-bot]

[REHEARSALNOTIFIER]
@tesshuflower: 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-multicloud-operators-foundation-backplane-2.6-e2e	stolostron/multicloud-operators-foundation	presubmit	Ci-operator config changed
pull-ci-stolostron-multicloud-operators-foundation-backplane-2.10-e2e	stolostron/multicloud-operators-foundation	presubmit	Ci-operator config changed
pull-ci-stolostron-multicloud-operators-foundation-backplane-2.11-e2e	stolostron/multicloud-operators-foundation	presubmit	Ci-operator config changed
pull-ci-stolostron-multicloud-operators-foundation-backplane-5.0-e2e	stolostron/multicloud-operators-foundation	presubmit	Ci-operator config changed
pull-ci-stolostron-multicloud-operators-foundation-backplane-2.8-e2e	stolostron/multicloud-operators-foundation	presubmit	Ci-operator config changed
pull-ci-stolostron-multicloud-operators-foundation-backplane-2.17-e2e	stolostron/multicloud-operators-foundation	presubmit	Ci-operator config changed
pull-ci-stolostron-multicloud-operators-foundation-backplane-2.9-e2e	stolostron/multicloud-operators-foundation	presubmit	Ci-operator config changed
pull-ci-stolostron-multicloud-operators-foundation-main-e2e	stolostron/multicloud-operators-foundation	presubmit	Ci-operator config changed
pull-ci-stolostron-multicloud-operators-foundation-backplane-2.7-e2e	stolostron/multicloud-operators-foundation	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.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhaiducek, tesshuflower

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:

• ci-operator/config/stolostron/multicloud-operators-foundation/OWNERS [dhaiducek,tesshuflower]

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

[rokej]

/pj-rehearse ack

[dhaiducek]

/pj-rehearse ack

[openshift-merge-bot]

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

[openshift-ci]

@tesshuflower: The following test 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/stolostron/multicloud-operators-foundation/backplane-2.10/e2e	e7c6511	link	unknown	/pj-rehearse pull-ci-stolostron-multicloud-operators-foundation-backplane-2.10-e2e

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.

[rokej]

/pj-rehearse ack

[openshift-merge-bot]

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