Skip to content
Open
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
9 changes: 7 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ concurrency:

jobs:
release:
if: '!cancelled()'
if: |
!cancelled()
&& (
github.event_name != 'pull_request'
|| github.event.pull_request.head.repo.full_name == github.repository
)
uses: NVIDIA-NeMo/FW-CI-templates/.github/workflows/[email protected]
with:
release-ref: ${{ inputs.release-ref || github.sha }}
Expand All @@ -82,7 +87,7 @@ jobs:

release-summary:
needs: [release]
if: ${{ !cancelled() }}
if: ${{ !cancelled() && needs.release.result != 'skipped' }}
runs-on: ubuntu-latest
steps:
- name: Result
Expand Down
5 changes: 4 additions & 1 deletion nemo_run/run/torchx_backend/schedulers/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,11 @@ def local_logs(container: DockerContainer):
def _cancel_existing(self, app_id: str) -> None:
req = DockerJobRequest.load(app_id=app_id)
if not req:
return None
return
status = json.dumps({"id": app_id, "exit_code": "1"}) + "\n"
for container in req.containers:
status_file = Path(req.executor.job_dir) / f"status_{container.name}.out"
status_file.write_text(status)
container.delete(client=self._docker_client, id=req.id)

def close(self) -> None:
Expand Down
28 changes: 28 additions & 0 deletions test/run/torchx_backend/schedulers/test_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,34 @@ def test_docker_scheduler_methods(docker_scheduler):
assert hasattr(docker_scheduler, "close")


def test_cancel_existing_without_request_is_noop():
docker_scheduler = object.__new__(PersistentDockerScheduler)
docker_scheduler._DockerWorkspaceMixin__docker_client = mock.Mock()
docker_scheduler._scheduled_reqs = []

with mock.patch.object(DockerJobRequest, "load", return_value=None):
docker_scheduler._cancel_existing("app-id")


def test_cancel_existing_persists_terminal_status(tmp_path):
docker_scheduler = object.__new__(PersistentDockerScheduler)
docker_scheduler._DockerWorkspaceMixin__docker_client = mock.Mock()
docker_scheduler._scheduled_reqs = []
container = mock.Mock(name="container")
container.name = "task-1-0"
request = mock.Mock()
request.id = "app-id"
request.executor.job_dir = str(tmp_path)
request.containers = [container]

with mock.patch.object(DockerJobRequest, "load", return_value=request):
docker_scheduler._cancel_existing("app-id")

container.delete.assert_called_once_with(client=docker_scheduler._docker_client, id="app-id")
status = json.loads((tmp_path / "status_task-1-0.out").read_text())
assert status == {"id": "app-id", "exit_code": "1"}


def test_schedule(docker_scheduler, mock_app_def, docker_executor):
with (
mock.patch.object(DockerExecutor, "package") as mock_package,
Expand Down
Loading