Run ruff format & ruff check

Author: lfrancke

apps/src/jenkins-job-builder.py

@@ -33,8 +33,7 @@ def get_platform_metadata():
     Creates a dict containing display name and version list for a given platform.
     """
     return {
-        p["id"]: {"name": p["name"], "versions": [v for v in p["versions"]]}
-        for p in catalog.platforms
+        p["id"]: {"name": p["name"], "versions": dict(p["versions"])} for p in catalog.platforms
     }
 
 
@@ -143,17 +142,30 @@ def execute_jjb():
     """
     exit_code = os.system("jenkins-jobs --conf /jjb/jjb.conf update /jjb/maintenance.yaml")
     if exit_code != 0:
-        print(f"ERROR: jenkins-jobs failed for maintenance.yaml with exit code {exit_code}", file=sys.stderr)
+        print(
+            f"ERROR: jenkins-jobs failed for maintenance.yaml with exit code {exit_code}",
+            file=sys.stderr,
+        )
         sys.exit(1)
 
-    exit_code = os.system("jenkins-jobs --conf /jjb/jjb.conf update /jjb/operator_weekly_tests.yaml")
+    exit_code = os.system(
+        "jenkins-jobs --conf /jjb/jjb.conf update /jjb/operator_weekly_tests.yaml"
+    )
     if exit_code != 0:
-        print(f"ERROR: jenkins-jobs failed for operator_weekly_tests.yaml with exit code {exit_code}", file=sys.stderr)
+        print(
+            f"ERROR: jenkins-jobs failed for operator_weekly_tests.yaml with exit code {exit_code}",
+            file=sys.stderr,
+        )
         sys.exit(1)
 
-    exit_code = os.system("jenkins-jobs --conf /jjb/jjb.conf update /jjb/operator_custom_tests.yaml")
+    exit_code = os.system(
+        "jenkins-jobs --conf /jjb/jjb.conf update /jjb/operator_custom_tests.yaml"
+    )
     if exit_code != 0:
-        print(f"ERROR: jenkins-jobs failed for operator_custom_tests.yaml with exit code {exit_code}", file=sys.stderr)
+        print(
+            f"ERROR: jenkins-jobs failed for operator_custom_tests.yaml with exit code {exit_code}",
+            file=sys.stderr,
+        )
         sys.exit(1)
 
 

apps/src/modules/catalog.py

@@ -194,7 +194,11 @@ def get_auto_retry_config(operator_id):
     operator_test = get_operator_test(operator_id)
 
     # Default configuration
-    default_config = {"attempts_parallel": 0, "attempts_serial": 3, "delete_failed_namespaces": True}
+    default_config = {
+        "attempts_parallel": 0,
+        "attempts_serial": 3,
+        "delete_failed_namespaces": True,
+    }
 
     if not operator_test or "auto_retry" not in operator_test:
         return default_config

apps/src/modules/provider_replicated.py

@@ -67,7 +67,7 @@ def get_cluster(name):
     Get cluster by name
     """
     clusters = get_clusters()
-    return clusters[name] if name in clusters else None
+    return clusters.get(name, None)
 
 
 def wait_for_running_cluster(name, logger):

apps/src/operator-test-runner.py

@@ -161,9 +161,8 @@ def log(msg=""):
     timestamp = f"{datetime.now(UTC):%Y-%m-%d %H:%M:%S}"
     print(f"{timestamp} :: {msg}")
     sys.stdout.flush()
-    f = open(TESTDRIVER_LOGFILE, "a")
-    f.write(f"{timestamp} :: {msg}\n")
-    f.close()
+    with open(TESTDRIVER_LOGFILE, "a") as f:
+        f.write(f"{timestamp} :: {msg}\n")
 
 
 def clone_git_repo(repo):
@@ -193,13 +192,13 @@ def run_tests(operator, operator_version, test_script_params):
     """
 
     # Get test script configuration - check for runtime override first
-    test_script_override = os.environ.get('TEST_SCRIPT', '').strip()
+    test_script_override = os.environ.get("TEST_SCRIPT", "").strip()
 
-    if test_script_override == 'Auto-retry':
-        test_script = 'auto-retry-tests.py'
+    if test_script_override == "Auto-retry":
+        test_script = "auto-retry-tests.py"
         log(f"Using test script: {test_script} (user override)")
-    elif test_script_override == 'run-tests':
-        test_script = 'run-tests'
+    elif test_script_override == "run-tests":
+        test_script = "run-tests"
         log(f"Using test script: {test_script} (user override)")
     else:
         # Default or empty - use catalog configuration
@@ -235,7 +234,7 @@ def run_tests(operator, operator_version, test_script_params):
                 parts = test_script_params.split("--parallel")
                 if len(parts) > 1:
                     parallel_value = parts[1].strip().split()[0]
-            except:
+            except Exception:
                 pass
 
         # Build command for auto-retry-tests.py