cleanup

Author: pawelpaszki

images/tests/run-tests.sh

@@ -55,19 +55,23 @@ cleanup_on_exit() {
                     echo "WARNING: TEST_USER_USERNAME not found, cannot cleanup RBAC"
                 fi
 
-                # Set Kueue Component to Removed State
-                echo "Setting Kueue component to Removed state..."
-                DSC_NAME=$(get_dsc_name 2>/dev/null || echo "")
-
-                if [ -n "$DSC_NAME" ] && [[ ! "$DSC_NAME" =~ ^ERROR ]]; then
-                    set_kueue_management_state "Removed" "$DSC_NAME" 2>/dev/null || {
-                        echo "WARNING: Failed to set Kueue to Removed state"
-                    }
-                    wait_for_dsc_ready 600 2>/dev/null || {
-                        echo "WARNING: DataScienceCluster did not reach Ready state after setting Kueue to Removed"
-                    }
+                # Set Kueue Component to Removed State (only if we changed it)
+                if [ "${INITIAL_KUEUE_STATE:-}" = "Unmanaged" ]; then
+                    echo "Kueue was already Unmanaged at start, skipping state change in cleanup"
                 else
-                    echo "WARNING: Failed to get DataScienceCluster name, skipping Kueue cleanup"
+                    echo "Setting Kueue component to Removed state..."
+                    DSC_NAME=$(get_dsc_name 2>/dev/null || echo "")
+
+                    if [ -n "$DSC_NAME" ] && [[ ! "$DSC_NAME" =~ ^ERROR ]]; then
+                        set_kueue_management_state "Removed" "$DSC_NAME" 2>/dev/null || {
+                            echo "WARNING: Failed to set Kueue to Removed state"
+                        }
+                        wait_for_dsc_ready 600 2>/dev/null || {
+                            echo "WARNING: DataScienceCluster did not reach Ready state after setting Kueue to Removed"
+                        }
+                    else
+                        echo "WARNING: Failed to get DataScienceCluster name, skipping Kueue cleanup"
+                    fi
                 fi
             else
                 echo "WARNING: Failed to login with OCP_ADMIN_USER for cleanup"
@@ -186,6 +190,28 @@ wait_for_dsc_ready() {
     return 1
 }
 
+# Get Kueue component management state
+# Arguments: cluster_name
+get_kueue_management_state() {
+    local cluster_name=$1
+
+    if [ -z "$cluster_name" ]; then
+        echo "ERROR: Invalid arguments for get_kueue_management_state"
+        return 1
+    fi
+
+    local state
+    state=$(oc get DataScienceCluster "$cluster_name" -o jsonpath='{.spec.components.kueue.managementState}' 2>/dev/null)
+
+    if [ -z "$state" ]; then
+        echo "ERROR: Failed to get Kueue management state"
+        return 1
+    fi
+
+    echo "$state"
+    return 0
+}
+
 # Set Kueue component management state
 # Arguments: state (Unmanaged or Removed), cluster_name
 set_kueue_management_state() {
@@ -296,22 +322,38 @@ echo "Successfully logged in with OCP_ADMIN_USER (verified: $CURRENT_USER)"
 # ============================================================================
 # Set Kueue Component to Unmanaged State
 # ============================================================================
-echo "Setting Kueue component to Unmanaged state..."
+echo "Checking current Kueue component state..."
 DSC_NAME=$(get_dsc_name) || {
     echo "ERROR: Failed to get DataScienceCluster name"
     exit 1
 }
 
-set_kueue_management_state "Unmanaged" "$DSC_NAME" || {
-    echo "ERROR: Failed to set Kueue to Unmanaged state"
+# Get and store the initial Kueue management state
+INITIAL_KUEUE_STATE=$(get_kueue_management_state "$DSC_NAME") || {
+    echo "ERROR: Failed to get initial Kueue management state"
     exit 1
 }
+echo "Initial Kueue management state: $INITIAL_KUEUE_STATE"
 
-# Wait for DataScienceCluster to be Ready after setting Kueue to Unmanaged
-wait_for_dsc_ready 600 || {
-    echo "ERROR: DataScienceCluster did not reach Ready state after setting Kueue to Unmanaged"
-    exit 1
-}
+# Export it so cleanup function can access it
+export INITIAL_KUEUE_STATE
+
+# Only set to Unmanaged if it's not already Unmanaged
+if [ "$INITIAL_KUEUE_STATE" = "Unmanaged" ]; then
+    echo "Kueue is already in Unmanaged state, skipping state change"
+else
+    echo "Setting Kueue component to Unmanaged state..."
+    set_kueue_management_state "Unmanaged" "$DSC_NAME" || {
+        echo "ERROR: Failed to set Kueue to Unmanaged state"
+        exit 1
+    }
+
+    # Wait for DataScienceCluster to be Ready after setting Kueue to Unmanaged
+    wait_for_dsc_ready 600 || {
+        echo "ERROR: DataScienceCluster did not reach Ready state after setting Kueue to Unmanaged"
+        exit 1
+    }
+fi
 
 # ============================================================================
 # Apply RBAC Policies

results/results.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite name="codeflare-sdk" errors="0" failures="0" skipped="0" tests="2" time="201.043" timestamp="2025-11-27T10:03:00.294945" hostname="73450509f8a1"><testcase classname="tests.upgrade.01_raycluster_sdk_upgrade_test.TestMnistJobSubmit" name="test_mnist_job_submission" time="27.377" /><testcase classname="tests.upgrade.02_dashboard_ui_upgrade_test.TestDistributedWorkloadsUIPostUpgrade" name="test_verify_cluster_persists_after_upgrade" time="169.695" /></testsuite></testsuites>

tests/ui/README.md

@@ -223,4 +223,3 @@ The UI tests are designed to run in the same container as the other tests. The `
 - Add cross-browser testing (Firefox, Edge)
 - Expand coverage to other RHOAI Dashboard pages
 - Add performance metrics collection
-

tests/ui/__init__.py

@@ -11,4 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-

tests/ui/conftest.py

@@ -114,12 +114,13 @@ def login_to_dashboard(selenium_driver, dashboard_url, test_credentials):
 
     # Give page time to load
     import time
+
     time.sleep(3)
 
     try:
         print(f"Current URL after navigation: {driver.current_url}")
         print(f"Page title: {driver.title}")
-        
+
         # First, check if we're already on the dashboard (no login required)
         try:
             # Try multiple possible dashboard indicators
@@ -135,12 +136,14 @@ def login_to_dashboard(selenium_driver, dashboard_url, test_credentials):
                 (By.CSS_SELECTOR, "[class*='odh-dashboard']"),
                 (By.CSS_SELECTOR, "[class*='app-launcher']"),
             ]
-            
+
             for locator in dashboard_indicators:
                 try:
                     element = driver.find_element(*locator)
                     if element.is_displayed():
-                        print(f"Already on dashboard, no login required (found: {locator})")
+                        print(
+                            f"Already on dashboard, no login required (found: {locator})"
+                        )
                         return driver
                 except:
                     continue
@@ -149,19 +152,19 @@ def login_to_dashboard(selenium_driver, dashboard_url, test_credentials):
 
         # Not on dashboard, try to login
         print("Dashboard not found, attempting login...")
-        
+
         # First, check if we need to select an identity provider (OpenShift OAuth page)
         # This page typically shows buttons like "htpasswd", "ldap", etc.
         try:
             print("Checking for identity provider selection page...")
-            
+
             # Try to find all available IDPs
             idp_selectors = [
                 (By.XPATH, "//a[contains(@href, 'oauth/authorize')]"),
                 (By.XPATH, "//div[@data-test-id='login']//a"),
                 (By.XPATH, "//div[contains(@class, 'login')]//a"),
             ]
-            
+
             all_idp_buttons = []
             for by, value in idp_selectors:
                 try:
@@ -170,33 +173,49 @@ def login_to_dashboard(selenium_driver, dashboard_url, test_credentials):
                         elem_text = elem.text.lower() if elem.text else ""
                         elem_href = elem.get_attribute("href") or ""
                         # Check if it's an IDP link
-                        if "authorize" in elem_href or any(keyword in elem_text for keyword in ["htpasswd", "ldap", "login", "log in", "sign in", "kube"]):
+                        if "authorize" in elem_href or any(
+                            keyword in elem_text
+                            for keyword in [
+                                "htpasswd",
+                                "ldap",
+                                "login",
+                                "log in",
+                                "sign in",
+                                "kube",
+                            ]
+                        ):
                             all_idp_buttons.append((elem, elem.text, elem_href))
-                            print(f"Found IDP option: text='{elem.text}', href='{elem_href[:100]}'")
+                            print(
+                                f"Found IDP option: text='{elem.text}', href='{elem_href[:100]}'"
+                            )
                 except Exception as e:
                     continue
-            
+
             if all_idp_buttons:
                 # Try to intelligently select the right IDP based on username
                 username = test_credentials["username"].lower()
                 selected_idp = None
-                
+
                 # Strategy 1: Match username pattern to IDP name
                 if "ldap" in username:
                     # Look for ldap IDP
                     for elem, text, href in all_idp_buttons:
                         if "ldap" in text.lower() or "ldap" in href.lower():
                             selected_idp = (elem, text)
-                            print(f"Selected LDAP IDP based on username pattern: {text}")
+                            print(
+                                f"Selected LDAP IDP based on username pattern: {text}"
+                            )
                             break
                 elif "htpasswd" in username or "admin" in username:
                     # Look for htpasswd IDP
                     for elem, text, href in all_idp_buttons:
                         if "htpasswd" in text.lower() or "htpasswd" in href.lower():
                             selected_idp = (elem, text)
-                            print(f"Selected htpasswd IDP based on username pattern: {text}")
+                            print(
+                                f"Selected htpasswd IDP based on username pattern: {text}"
+                            )
                             break
-                
+
                 # Strategy 2: If no match, use environment variable if set
                 if not selected_idp:
                     idp_name = os.getenv("OPENSHIFT_IDP_NAME", "").lower()
@@ -206,16 +225,18 @@ def login_to_dashboard(selenium_driver, dashboard_url, test_credentials):
                                 selected_idp = (elem, text)
                                 print(f"Selected IDP from environment variable: {text}")
                                 break
-                
+
                 # Strategy 3: If still no match and only one IDP, use it
                 if not selected_idp and len(all_idp_buttons) == 1:
                     selected_idp = (all_idp_buttons[0][0], all_idp_buttons[0][1])
                     print(f"Only one IDP available, using: {selected_idp[1]}")
-                
+
                 # Strategy 4: If multiple IDPs and no match, skip IDP selection
                 # (some clusters may not require IDP selection if there's a default)
                 if not selected_idp:
-                    print(f"Multiple IDPs found but couldn't determine which to use. Available: {[text for _, text, _ in all_idp_buttons]}")
+                    print(
+                        f"Multiple IDPs found but couldn't determine which to use. Available: {[text for _, text, _ in all_idp_buttons]}"
+                    )
                     print("Skipping IDP selection, will try direct login form")
                 else:
                     print(f"Clicking identity provider button: {selected_idp[1]}")
@@ -224,7 +245,7 @@ def login_to_dashboard(selenium_driver, dashboard_url, test_credentials):
                     print(f"After IDP click - URL: {driver.current_url}")
         except Exception as e:
             print(f"No identity provider selection needed or failed to handle: {e}")
-        
+
         # Handle OpenShift OAuth login flow
         # Wait for username field (various possible IDs depending on OAuth provider)
         username_field = None
@@ -292,18 +313,18 @@ def login_to_dashboard(selenium_driver, dashboard_url, test_credentials):
         # Try multiple possible indicators that we're on the dashboard
         print("Waiting for dashboard to load...")
         dashboard_loaded = False
-        
+
         for i in range(6):  # Try for up to 30 seconds (6 * 5 seconds)
             time.sleep(5)
             print(f"Attempt {i+1}/6 - Current URL: {driver.current_url}")
             print(f"Attempt {i+1}/6 - Page title: {driver.title}")
-            
+
             # Check if page title indicates we're on the dashboard
             if "Red Hat OpenShift AI" in driver.title or "OpenShift" in driver.title:
                 print(f"Dashboard loaded successfully (title: {driver.title})")
                 dashboard_loaded = True
                 break
-            
+
             # Try finding dashboard elements
             for locator in dashboard_indicators:
                 try:
@@ -314,7 +335,7 @@ def login_to_dashboard(selenium_driver, dashboard_url, test_credentials):
                         break
                 except:
                     continue
-            
+
             if dashboard_loaded:
                 break
 
@@ -336,14 +357,13 @@ def login_to_dashboard(selenium_driver, dashboard_url, test_credentials):
             print(f"Screenshot saved to: {screenshot_path}")
         except:
             pass
-        
+
         # Print page source for debugging (first 1000 chars)
         try:
             print(f"\nPage source preview:\n{driver.page_source[:1000]}")
         except:
             pass
-        
+
         raise
 
     return driver
-

tests/ui/pages/__init__.py

@@ -11,4 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-