From fcae617e3a50c0b6094d518f73ffebf625bbc952 Mon Sep 17 00:00:00 2001 From: Michael Pruitt Date: Tue, 4 Aug 2026 09:38:35 -0500 Subject: [PATCH 1/2] Update OPP 4.22 interop jobs to install ACM 2.17.z The OCP 4.22 interop and upgrade jobs were installing ACM 2.16.z, which is outdated. Update operator channel from release-2.16 to release-2.17 and bump ACM QE test image references from 2.16 to 2.17 across all OPP 4.22 variants (AWS, vSphere, upgrade). Resolves: https://redhat.atlassian.net/browse/INTEROP-9406 --- ...tolostron-policy-collection-main__ocp4.22-upgrade.yaml | 2 +- .../stolostron-policy-collection-main__ocp4.22.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml index a8e4a9187d0b1..1decf2473c8c0 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml @@ -56,7 +56,7 @@ tests: FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" OPERATORS: | [ - {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.16", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}, + {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}, {"name": "rhacs-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "rhacs-operator", "target_namespaces": "rhacs-operator"}, {"name": "odf-operator", "source": "redhat-operators", "channel": "stable-4.21", "install_namespace": "openshift-storage", "target_namespaces": "openshift-storage"}, {"name": "quay-operator", "source": "redhat-operators", "channel": "stable-3.17", "install_namespace": "openshift-operators"} diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22.yaml index 7c648df07abcf..8e4e3e2450076 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22.yaml @@ -1,10 +1,10 @@ base_images: acmqe-grc-test: - name: "2.16" + name: "2.17" namespace: acm-qe tag: acmqe-grc-test clc-ui-e2e: - name: "2.16" + name: "2.17" namespace: acm-qe tag: clc-ui-e2e cli: @@ -94,7 +94,7 @@ tests: ODF_VERSION_MAJOR_MINOR: "4.21" OPERATORS: | [ - {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.16", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} + {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} ] QUAY_OPERATOR_CHANNEL: stable-3.17 TEST_IMPORTANCE: LEVEL0 @@ -165,7 +165,7 @@ tests: OPENSHIFT_REQUIRED_MEMORY: "288" OPERATORS: | [ - {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.16", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} + {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} ] QUAY_OPERATOR_CHANNEL: stable-3.17 SIZE_VARIANT: large From 67314c0f561863ba90111fd78da6f89c0d8f24ba Mon Sep 17 00:00:00 2001 From: Michael Pruitt Date: Tue, 4 Aug 2026 10:15:56 -0500 Subject: [PATCH 2/2] Update OPP preflight compatibility matrix for ACM 2.17 on OCP 4.22 Align the preflight version check with the operator channel change: ACM minimum version for OCP 4.22 is now 2.17, matching the OPERATORS channel in the interop job configs. --- .../interop/opp/preflight/interop-opp-preflight-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh b/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh index f11b8d892696c..b5409e5a67a74 100755 --- a/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh +++ b/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh @@ -72,7 +72,7 @@ OPP_COMPAT["4.18"]="advanced-cluster-management:2.13 rhacs-operator:4.7 odf-oper OPP_COMPAT["4.19"]="advanced-cluster-management:2.13 rhacs-operator:4.8 odf-operator:4.19 quay-operator:3.14" OPP_COMPAT["4.20"]="advanced-cluster-management:2.14 rhacs-operator:4.9 odf-operator:4.20 quay-operator:3.15" OPP_COMPAT["4.21"]="advanced-cluster-management:2.15 rhacs-operator:4.10 odf-operator:4.21 quay-operator:3.15" -OPP_COMPAT["4.22"]="advanced-cluster-management:2.16 rhacs-operator:4.11 odf-operator:4.22 quay-operator:3.16" +OPP_COMPAT["4.22"]="advanced-cluster-management:2.17 rhacs-operator:4.11 odf-operator:4.22 quay-operator:3.16" OPP_COMPAT["5.0"]="advanced-cluster-management:2.17 quay-operator:3.17" # ──────────────────────────────────────────────────────────────────────