Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# ------------------------------------------------------------------------------
# Stage 1: builder - install build deps, compile extensions, sync dependencies
# ------------------------------------------------------------------------------
FROM registry.access.redhat.com/ubi10/ubi-minimal:10.1@sha256:c858c2eb5bd336d8c400f6ee976a9d731beccf3351fa7a6f485dced24ae4af17 AS builder
FROM registry.access.redhat.com/ubi10/ubi-minimal:10.1@sha256:7bd3d2e7f5c507aebd1575d0f2fab9fe3e882e25fee54fa07f7970aa8bbc5fab AS builder

ARG APP_DIR=/app
ARG OPENSHIFT_PYTHON_WRAPPER_COMMIT=''
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN uv sync --locked \
# ------------------------------------------------------------------------------
# Stage 2: runtime - clean image with only runtime dependencies
# ------------------------------------------------------------------------------
FROM registry.access.redhat.com/ubi10/ubi-minimal:10.1@sha256:c858c2eb5bd336d8c400f6ee976a9d731beccf3351fa7a6f485dced24ae4af17
FROM registry.access.redhat.com/ubi10/ubi-minimal:10.1@sha256:7bd3d2e7f5c507aebd1575d0f2fab9fe3e882e25fee54fa07f7970aa8bbc5fab

ARG APP_DIR=/app

Expand Down
2 changes: 1 addition & 1 deletion cli/mtv_api_tests/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def _get_cluster_config(ocp_provider: dict[str, Any] | None) -> tuple[list[str],
if result.returncode == 0 and result.stdout.strip():
console.print(" [green]Using existing cluster token from 'oc whoami -t'[/green]")
return [], {}
except (FileNotFoundError, subprocess.TimeoutExpired):
except FileNotFoundError, subprocess.TimeoutExpired:
pass

console.print("\n[yellow]No cluster token found. Provide cluster credentials:[/yellow]")
Expand Down
2 changes: 1 addition & 1 deletion libs/providers/openshift.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def vm_dict(
# Node name - where the VM is scheduled (collected after VM start)
try:
result_vm_info["node_name"] = cnv_vm.vmi.instance.status.nodeName
except (AttributeError, NotFoundError):
except AttributeError, NotFoundError:
LOGGER.debug("Could not retrieve node name for VM %s", cnv_vm_name)
result_vm_info["node_name"] = None

Expand Down
4 changes: 2 additions & 2 deletions libs/providers/vmware.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def update_provider_clone_method(self) -> None:
except ApiException as e:
LOGGER.exception(f"Kubernetes API error updating provider with esxiCloneMethod: {e.reason}")
raise
except (ValueError, RuntimeError):
except ValueError, RuntimeError:
LOGGER.exception("Failed to update provider with esxiCloneMethod")
raise

Expand Down Expand Up @@ -1056,7 +1056,7 @@ def _resolve_datastore(disk_datastore_id: str | None) -> vim.Datastore:
datacenter=datacenter,
createParentDirectories=True,
)
except (vim.fault.FileAlreadyExists, vim.fault.CannotCreateFile):
except vim.fault.FileAlreadyExists, vim.fault.CannotCreateFile:
LOGGER.debug("Directory '%s' already exists, proceeding.", datastore_path)
except Exception as e:
LOGGER.warning("Could not automatically create directory '%s': %s", datastore_path, e)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ignore_missing_imports = true
dev = ["ipdb>=0.13.13", "ipython>=8.12.3", "python-jenkins>=1.8.2"]

[project]
requires-python = ">=3.12, <3.14"
requires-python = ">=3.14, <3.15"
name = "mtv-api-tests"
version = "2.12.0"
description = "MTV API Tests"
Expand Down
2 changes: 1 addition & 1 deletion utilities/mtv_migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ def wait_for_migration_complate(plan: Plan) -> None:
elif sample == Plan.Status.FAILED:
raise MigrationPlanExecError()

except (TimeoutExpiredError, MigrationPlanExecError):
except TimeoutExpiredError, MigrationPlanExecError:
raise MigrationPlanExecError(
f"Plan {plan.name} failed to reach the expected condition. \nstatus:\n\t{plan.instance}"
)
Expand Down
8 changes: 4 additions & 4 deletions utilities/ssh_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def attempt_port_forward():
self.port_forward_process.terminate()
try:
self.port_forward_process.wait(timeout=5)
except (subprocess.TimeoutExpired, ProcessLookupError, OSError):
except subprocess.TimeoutExpired, ProcessLookupError, OSError:
self.port_forward_process.kill()
self.port_forward_process = None
return False
Expand All @@ -186,7 +186,7 @@ def attempt_port_forward():
try:
self.port_forward_process.terminate()
self.port_forward_process.wait(timeout=5)
except (subprocess.TimeoutExpired, ProcessLookupError, OSError):
except subprocess.TimeoutExpired, ProcessLookupError, OSError:
self.port_forward_process.kill()
self.port_forward_process = None
return False
Expand Down Expand Up @@ -283,7 +283,7 @@ def disconnect(self) -> None:
LOGGER.warning(f"Error terminating port-forward process: {e}")
try:
self.port_forward_process.kill()
except (ProcessLookupError, OSError):
except ProcessLookupError, OSError:
# Process already terminated, ignore
pass
finally:
Expand Down Expand Up @@ -379,7 +379,7 @@ def ocp_token(self) -> str | None:
api_key = self._ocp_client.configuration.api_key.get("authorization")
if api_key:
return api_key.split()[-1]
except (AttributeError, KeyError, IndexError):
except AttributeError, KeyError, IndexError:
pass
return None

Expand Down
2 changes: 1 addition & 1 deletion utilities/worker_node_selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def parse_prometheus_value(raw_value: object) -> int:
):
try:
return int(float(raw_value[1]))
except (ValueError, TypeError):
except ValueError, TypeError:
return 0
return 0

Expand Down
Loading