From cf0f0fc5ccfcbd5ac04abd9a09df734e6bd4a975 Mon Sep 17 00:00:00 2001
From: Max Cao <macao@redhat.com>
Date: Thu, 2 Jul 2026 15:57:18 -0700
Subject: [PATCH] Add CRO upgrade test enhancements

Signed-off-by: Max Cao <macao@redhat.com>
---
 ...ource-override-admission-operator-main.yaml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-main.yaml b/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-main.yaml
index 3cc01678ea813..82382d8ab34b2 100644
--- a/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-main.yaml
+++ b/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-main.yaml
@@ -7,6 +7,10 @@ base_images:
     name: "4.22"
     namespace: ocp
     tag: cluster-resource-override-admission-operator-bundle
+  previous-operand:
+    name: "4.22"
+    namespace: ocp
+    tag: cluster-resource-override-admission
   previous-operator:
     name: "4.22"
     namespace: ocp
@@ -131,6 +135,7 @@ tests:
         export OLD_CSV_NAME=$(oc get csv -n $NS -o jsonpath='{.items[0].metadata.name}')
 
         oc patch csv -n $NS $OLD_CSV_NAME --type='json' -p="[{\"op\": \"replace\", \"path\": \"/spec/install/spec/deployments/0/spec/template/spec/containers/0/image\", \"value\": \"$PREVIOUS_OPERATOR\"}]"
+        oc patch csv -n $NS $OLD_CSV_NAME --type='json' -p="[{\"op\": \"replace\", \"path\": \"/spec/install/spec/deployments/0/spec/template/spec/containers/0/env/2/value\", \"value\": \"$PREVIOUS_OPERAND\"}]"
         sleep 10
 
         # Delete the deployment which will then be recreated by the subscription controller with the correct image.
@@ -143,10 +148,21 @@ tests:
         name: previous-bundle
       - env: PREVIOUS_OPERATOR
         name: previous-operator
+      - env: PREVIOUS_OPERAND
+        name: previous-operand
       from: operator-sdk
       resources:
         requests:
           cpu: 100m
+    - as: pre-check
+      cli: latest
+      commands: |
+        export KUBECTL=$(which oc)
+        make e2e-upgrade-pre
+      from: src
+      resources:
+        requests:
+          cpu: 100m
     - as: upgrade
       cli: latest
       commands: |
@@ -163,7 +179,7 @@ tests:
       cli: latest
       commands: |
         export KUBECTL=$(which oc)
-        make e2e
+        make e2e-upgrade-post e2e
       from: src
       resources:
         requests: