RHOAIENG-32532: Fix broken E2E tests

Author: kryanbeane

.github/workflows/e2e_tests.yaml

@@ -57,7 +57,7 @@ jobs:
       - name: Set up specific Python version
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
           cache: 'pip' # caching pip dependencies
 
       - name: Setup NVidia GPU environment for KinD

.github/workflows/rayjob_e2e_tests.yaml

@@ -1,4 +1,4 @@
-name: rayjob-e2e-with-kueue
+name: rayjob-e2e
 
 on:
   pull_request:

src/codeflare_sdk/ray/cluster/cluster.py

@@ -783,6 +783,12 @@ def remove_autogenerated_fields(resource):
                 del resource[key]
             else:
                 remove_autogenerated_fields(resource[key])
+
+        # After cleaning, remove empty metadata sections
+        if "metadata" in resource and isinstance(resource["metadata"], dict):
+            if len(resource["metadata"]) == 0:
+                del resource["metadata"]
+
     elif isinstance(resource, list):
         for item in resource:
             remove_autogenerated_fields(item)

tests/e2e/rayjob/ray_version_validation_oauth_test.py

@@ -11,10 +11,7 @@
     ManagedClusterConfig,
 )
 
-# This test validates Ray version compatibility checking for RayJob with cluster lifecycling scenarios
 
-
-@pytest.mark.openshift
 class TestRayJobRayVersionValidationOauth:
     def setup_method(self):
         initialize_kubernetes_client(self)