Skip to content
Merged
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
2 changes: 1 addition & 1 deletion fournos/core/resolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def _load_job_template() -> dict:


def _resolve_job_name(name: str) -> str:
return f"resolve-{name}"
return f"{name}-resolve"


def _make_owner_ref(ref: dict) -> dict:
Expand Down
6 changes: 3 additions & 3 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ def get_pipelinerun_workspaces(name: str) -> list[dict]:
def resolve_job_exists(name: str) -> bool:
"""Check whether the resolve Job for *name* exists."""
result = subprocess.run(
["kubectl", "get", "job", f"resolve-{name}", "-n", NAMESPACE],
["kubectl", "get", "job", f"{name}-resolve", "-n", NAMESPACE],
capture_output=True,
)
return result.returncode == 0
Expand All @@ -310,7 +310,7 @@ def poll_resolve_job_complete(
timeout: float = 60.0,
) -> None:
"""Poll until the resolve Job for *name* has completed (succeeded or failed)."""
resolve_name = f"resolve-{name}"
resolve_name = f"{name}-resolve"
deadline = time.monotonic() + timeout
while time.monotonic() < deadline:
if not resolve_job_exists(name):
Expand Down Expand Up @@ -355,7 +355,7 @@ def _create_resolve_job(name: str, *, command: list[str]) -> None:
"apiVersion": "batch/v1",
"kind": "Job",
"metadata": {
"name": f"resolve-{name}",
"name": f"{name}-resolve",
"namespace": NAMESPACE,
"labels": {
"app.kubernetes.io/managed-by": "fournos",
Expand Down
Loading