From 11c1812ad1c30c24c984c332eed6ab82f7dec51c Mon Sep 17 00:00:00 2001 From: Tesshu Flower Date: Wed, 13 May 2026 13:00:52 -0400 Subject: [PATCH 1/3] MCE multicloud-operators-foundation e2e fix for 2.17 - e2e is using latest/main versions of images rather than ones that go with the specific release branch Signed-off-by: Tesshu Flower --- ...oud-operators-foundation-backplane-2.17.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.17.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.17.yaml index fe1c18aa2f1bb..321bdd1a1bf7f 100644 --- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.17.yaml +++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.17.yaml @@ -94,14 +94,15 @@ tests: commands: | export KUBECONFIG="${SHARED_DIR}/hub-1.kc" KUBECTL=oc - OCM_VERSION=main - REGISTRATION_OPERATOR_BRANCH=$OCM_VERSION - IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_VERSION - REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_VERSION - WORK_IMAGE=quay.io/stolostron/work:$OCM_VERSION - PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_VERSION - export KUBECTL IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE REGISTRATION_OPERATOR_BRANCH - export KUBECTL + OCM_BRANCH=backplane-2.17 + REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH + OPERATOR_IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_BRANCH + REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_BRANCH + WORK_IMAGE=quay.io/stolostron/work:$OCM_BRANCH + PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_BRANCH + ADDON_MANAGER_IMAGE=quay.io/stolostron/addon-manager:${OCM_BRANCH} + export KUBECTL REGISTRATION_OPERATOR_BRANCH OCM_BRANCH + export OPERATOR_IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE ADDON_MANAGER_IMAGE set -o pipefail make test-e2e 2>&1 | tee ${ARTIFACT_DIR}/e2e_tests_out.log set +o pipefail From e7c6511d7ac6a0cba2eb66822eb82ef215f1c5f3 Mon Sep 17 00:00:00 2001 From: Tesshu Flower Date: Wed, 13 May 2026 13:41:27 -0400 Subject: [PATCH 2/3] MCE multicloud-operators-foundation e2e fix all branches - run e2e using appropriate images for branch Signed-off-by: Tesshu Flower --- ...oud-operators-foundation-backplane-2.10.yaml | 17 +++++++++-------- ...oud-operators-foundation-backplane-2.11.yaml | 17 +++++++++-------- ...loud-operators-foundation-backplane-2.6.yaml | 17 +++++++++-------- ...loud-operators-foundation-backplane-2.7.yaml | 17 +++++++++-------- ...loud-operators-foundation-backplane-2.8.yaml | 17 +++++++++-------- ...loud-operators-foundation-backplane-2.9.yaml | 17 +++++++++-------- ...loud-operators-foundation-backplane-5.0.yaml | 17 +++++++++-------- ...on-multicloud-operators-foundation-main.yaml | 17 +++++++++-------- 8 files changed, 72 insertions(+), 64 deletions(-) diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.10.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.10.yaml index 52ac49341a448..a3211fa9d39ac 100644 --- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.10.yaml +++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.10.yaml @@ -90,14 +90,15 @@ tests: commands: | export KUBECONFIG="${SHARED_DIR}/hub-1.kc" KUBECTL=oc - OCM_VERSION=main - REGISTRATION_OPERATOR_BRANCH=$OCM_VERSION - IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_VERSION - REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_VERSION - WORK_IMAGE=quay.io/stolostron/work:$OCM_VERSION - PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_VERSION - export KUBECTL IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE REGISTRATION_OPERATOR_BRANCH - export KUBECTL + OCM_BRANCH=backplane-2.10 + REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH + OPERATOR_IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_BRANCH + REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_BRANCH + WORK_IMAGE=quay.io/stolostron/work:$OCM_BRANCH + PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_BRANCH + ADDON_MANAGER_IMAGE=quay.io/stolostron/addon-manager:${OCM_BRANCH} + export KUBECTL REGISTRATION_OPERATOR_BRANCH OCM_BRANCH + export OPERATOR_IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE ADDON_MANAGER_IMAGE set -o pipefail make test-e2e 2>&1 | tee ${ARTIFACT_DIR}/e2e_tests_out.log set +o pipefail diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.11.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.11.yaml index 1d7d2eaf85d2d..7ee90a6713caa 100644 --- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.11.yaml +++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.11.yaml @@ -94,14 +94,15 @@ tests: commands: | export KUBECONFIG="${SHARED_DIR}/hub-1.kc" KUBECTL=oc - OCM_VERSION=main - REGISTRATION_OPERATOR_BRANCH=$OCM_VERSION - IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_VERSION - REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_VERSION - WORK_IMAGE=quay.io/stolostron/work:$OCM_VERSION - PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_VERSION - export KUBECTL IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE REGISTRATION_OPERATOR_BRANCH - export KUBECTL + OCM_BRANCH=backplane-2.11 + REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH + OPERATOR_IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_BRANCH + REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_BRANCH + WORK_IMAGE=quay.io/stolostron/work:$OCM_BRANCH + PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_BRANCH + ADDON_MANAGER_IMAGE=quay.io/stolostron/addon-manager:${OCM_BRANCH} + export KUBECTL REGISTRATION_OPERATOR_BRANCH OCM_BRANCH + export OPERATOR_IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE ADDON_MANAGER_IMAGE set -o pipefail make test-e2e 2>&1 | tee ${ARTIFACT_DIR}/e2e_tests_out.log set +o pipefail diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.6.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.6.yaml index 4c32a393cb368..3f6feb01a8aa5 100644 --- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.6.yaml +++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.6.yaml @@ -86,14 +86,15 @@ tests: commands: | export KUBECONFIG="${SHARED_DIR}/hub-1.kc" KUBECTL=oc - OCM_VERSION=main - REGISTRATION_OPERATOR_BRANCH=$OCM_VERSION - IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_VERSION - REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_VERSION - WORK_IMAGE=quay.io/stolostron/work:$OCM_VERSION - PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_VERSION - export KUBECTL IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE REGISTRATION_OPERATOR_BRANCH - export KUBECTL + OCM_BRANCH=backplane-2.6 + REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH + OPERATOR_IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_BRANCH + REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_BRANCH + WORK_IMAGE=quay.io/stolostron/work:$OCM_BRANCH + PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_BRANCH + ADDON_MANAGER_IMAGE=quay.io/stolostron/addon-manager:${OCM_BRANCH} + export KUBECTL REGISTRATION_OPERATOR_BRANCH OCM_BRANCH + export OPERATOR_IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE ADDON_MANAGER_IMAGE set -o pipefail make test-e2e 2>&1 | tee ${ARTIFACT_DIR}/e2e_tests_out.log set +o pipefail diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.7.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.7.yaml index a940197632101..2e65da2f818d3 100644 --- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.7.yaml +++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.7.yaml @@ -90,14 +90,15 @@ tests: commands: | export KUBECONFIG="${SHARED_DIR}/hub-1.kc" KUBECTL=oc - OCM_VERSION=main - REGISTRATION_OPERATOR_BRANCH=$OCM_VERSION - IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_VERSION - REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_VERSION - WORK_IMAGE=quay.io/stolostron/work:$OCM_VERSION - PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_VERSION - export KUBECTL IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE REGISTRATION_OPERATOR_BRANCH - export KUBECTL + OCM_BRANCH=backplane-2.7 + REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH + OPERATOR_IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_BRANCH + REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_BRANCH + WORK_IMAGE=quay.io/stolostron/work:$OCM_BRANCH + PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_BRANCH + ADDON_MANAGER_IMAGE=quay.io/stolostron/addon-manager:${OCM_BRANCH} + export KUBECTL REGISTRATION_OPERATOR_BRANCH OCM_BRANCH + export OPERATOR_IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE ADDON_MANAGER_IMAGE set -o pipefail make test-e2e 2>&1 | tee ${ARTIFACT_DIR}/e2e_tests_out.log set +o pipefail diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.8.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.8.yaml index 621ff37bf7eb8..7e0ebb306f49a 100644 --- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.8.yaml +++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.8.yaml @@ -86,14 +86,15 @@ tests: commands: | export KUBECONFIG="${SHARED_DIR}/hub-1.kc" KUBECTL=oc - OCM_VERSION=main - REGISTRATION_OPERATOR_BRANCH=$OCM_VERSION - IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_VERSION - REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_VERSION - WORK_IMAGE=quay.io/stolostron/work:$OCM_VERSION - PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_VERSION - export KUBECTL IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE REGISTRATION_OPERATOR_BRANCH - export KUBECTL + OCM_BRANCH=backplane-2.8 + REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH + OPERATOR_IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_BRANCH + REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_BRANCH + WORK_IMAGE=quay.io/stolostron/work:$OCM_BRANCH + PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_BRANCH + ADDON_MANAGER_IMAGE=quay.io/stolostron/addon-manager:${OCM_BRANCH} + export KUBECTL REGISTRATION_OPERATOR_BRANCH OCM_BRANCH + export OPERATOR_IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE ADDON_MANAGER_IMAGE set -o pipefail make test-e2e 2>&1 | tee ${ARTIFACT_DIR}/e2e_tests_out.log set +o pipefail diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.9.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.9.yaml index c5da3ad9d7685..4956fa98e28f8 100644 --- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.9.yaml +++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.9.yaml @@ -90,14 +90,15 @@ tests: commands: | export KUBECONFIG="${SHARED_DIR}/hub-1.kc" KUBECTL=oc - OCM_VERSION=main - REGISTRATION_OPERATOR_BRANCH=$OCM_VERSION - IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_VERSION - REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_VERSION - WORK_IMAGE=quay.io/stolostron/work:$OCM_VERSION - PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_VERSION - export KUBECTL IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE REGISTRATION_OPERATOR_BRANCH - export KUBECTL + OCM_BRANCH=backplane-2.9 + REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH + OPERATOR_IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_BRANCH + REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_BRANCH + WORK_IMAGE=quay.io/stolostron/work:$OCM_BRANCH + PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_BRANCH + ADDON_MANAGER_IMAGE=quay.io/stolostron/addon-manager:${OCM_BRANCH} + export KUBECTL REGISTRATION_OPERATOR_BRANCH OCM_BRANCH + export OPERATOR_IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE ADDON_MANAGER_IMAGE set -o pipefail make test-e2e 2>&1 | tee ${ARTIFACT_DIR}/e2e_tests_out.log set +o pipefail diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-5.0.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-5.0.yaml index 7ad80157d296b..1b5e27bea829e 100644 --- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-5.0.yaml +++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-5.0.yaml @@ -94,14 +94,15 @@ tests: commands: | export KUBECONFIG="${SHARED_DIR}/hub-1.kc" KUBECTL=oc - OCM_VERSION=main - REGISTRATION_OPERATOR_BRANCH=$OCM_VERSION - IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_VERSION - REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_VERSION - WORK_IMAGE=quay.io/stolostron/work:$OCM_VERSION - PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_VERSION - export KUBECTL IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE REGISTRATION_OPERATOR_BRANCH - export KUBECTL + OCM_BRANCH=main + REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH + OPERATOR_IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_BRANCH + REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_BRANCH + WORK_IMAGE=quay.io/stolostron/work:$OCM_BRANCH + PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_BRANCH + ADDON_MANAGER_IMAGE=quay.io/stolostron/addon-manager:${OCM_BRANCH} + export KUBECTL REGISTRATION_OPERATOR_BRANCH OCM_BRANCH + export OPERATOR_IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE ADDON_MANAGER_IMAGE set -o pipefail make test-e2e 2>&1 | tee ${ARTIFACT_DIR}/e2e_tests_out.log set +o pipefail diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-main.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-main.yaml index 66c7d186d1e44..1fa582cca2f91 100644 --- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-main.yaml +++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-main.yaml @@ -90,14 +90,15 @@ tests: commands: | export KUBECONFIG="${SHARED_DIR}/hub-1.kc" KUBECTL=oc - OCM_VERSION=main - REGISTRATION_OPERATOR_BRANCH=$OCM_VERSION - IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_VERSION - REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_VERSION - WORK_IMAGE=quay.io/stolostron/work:$OCM_VERSION - PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_VERSION - export KUBECTL IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE REGISTRATION_OPERATOR_BRANCH - export KUBECTL + OCM_BRANCH=main + REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH + OPERATOR_IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_BRANCH + REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_BRANCH + WORK_IMAGE=quay.io/stolostron/work:$OCM_BRANCH + PLACEMENT_IMAGE=quay.io/stolostron/placement:$OCM_BRANCH + ADDON_MANAGER_IMAGE=quay.io/stolostron/addon-manager:${OCM_BRANCH} + export KUBECTL REGISTRATION_OPERATOR_BRANCH OCM_BRANCH + export OPERATOR_IMAGE_NAME REGISTRATION_IMAGE WORK_IMAGE PLACEMENT_IMAGE ADDON_MANAGER_IMAGE set -o pipefail make test-e2e 2>&1 | tee ${ARTIFACT_DIR}/e2e_tests_out.log set +o pipefail From ffb86b30628333144692a1ea6dffd9dd54fdc6bd Mon Sep 17 00:00:00 2001 From: Tesshu Flower Date: Wed, 13 May 2026 14:59:38 -0400 Subject: [PATCH 3/3] update backplane-5.0 to use proper br Signed-off-by: Tesshu Flower --- ...tolostron-multicloud-operators-foundation-backplane-5.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-5.0.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-5.0.yaml index 1b5e27bea829e..ffa097597c822 100644 --- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-5.0.yaml +++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-5.0.yaml @@ -94,7 +94,7 @@ tests: commands: | export KUBECONFIG="${SHARED_DIR}/hub-1.kc" KUBECTL=oc - OCM_BRANCH=main + OCM_BRANCH=backplane-5.0 REGISTRATION_OPERATOR_BRANCH=$OCM_BRANCH OPERATOR_IMAGE_NAME=quay.io/stolostron/registration-operator:$OCM_BRANCH REGISTRATION_IMAGE=quay.io/stolostron/registration:$OCM_BRANCH