From 170b530a298a67651eff459f1d8ee55cb8d05b75 Mon Sep 17 00:00:00 2001
From: Patryk Matuszak <pmatusza@redhat.com>
Date: Wed, 24 Jul 2024 16:44:58 +0200
Subject: [PATCH] Skip topolvm deletion check for crel upgrades

---
 test/suites/upgrade/upgrade-successful.robot | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/suites/upgrade/upgrade-successful.robot b/test/suites/upgrade/upgrade-successful.robot
index 521bdc57b9..0cb0b793f6 100644
--- a/test/suites/upgrade/upgrade-successful.robot
+++ b/test/suites/upgrade/upgrade-successful.robot
@@ -32,8 +32,12 @@ Upgrade
 
     Validate SELinux With Backup    ${future_backup}
 
-    # verifies that old TopoLVM resources are cleaned up after migration
-    Oc Wait    -f ${LVMS_TOPOLVM_DIFF} --for=Delete --timeout=${DEFAULT_WAIT_TIMEOUT}
+    # Skip topolvm deletion check if upgrade is to "crel" because (at the time of writing)
+    # it doesn't yet contain the topolvm -> lvms changes.
+    IF    'microshift-crel' not in '${TARGET_REF}'
+        # verifies that old TopoLVM resources are cleaned up after migration
+        Oc Wait    -f ${LVMS_TOPOLVM_DIFF} --for=Delete --timeout=${DEFAULT_WAIT_TIMEOUT}
+    END
 
 
 *** Keywords ***