From 2c51a2ffacdb22499e609147171b2c827d763020 Mon Sep 17 00:00:00 2001 From: "Felipe N. Schuch" Date: Thu, 2 Nov 2023 14:06:28 +0200 Subject: [PATCH] Add container to job-properties schema (#403) * fix(api): add container to job-properties schema It is new in Slurm RESTD 0.0.38 * fix: pin minio version on jobbergate-composed It looks like latest version is breaking QA tests on the API --- jobbergate-api/CHANGELOG.md | 2 +- .../jobbergate_api/apps/job_submissions/properties_parser.py | 2 +- jobbergate-api/jobbergate_api/apps/job_submissions/schemas.py | 1 + jobbergate-composed/docker-compose.yml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jobbergate-api/CHANGELOG.md b/jobbergate-api/CHANGELOG.md index 73eef3dd..b0e03097 100644 --- a/jobbergate-api/CHANGELOG.md +++ b/jobbergate-api/CHANGELOG.md @@ -7,7 +7,7 @@ This file keeps track of all notable changes to jobbergate-api - Changed internals to avoid committing to the database when a GET request is made - Added extra settings to allow profiling and tracing on sentry - Removed db-start from dev-tools - +- Added `container` on job properties for submissions, new in Slurm REST 0.0.38 ## 4.1.0a2 -- 2023-10-10 - Made `runtime_config` optional when uploading a workflow file diff --git a/jobbergate-api/jobbergate_api/apps/job_submissions/properties_parser.py b/jobbergate-api/jobbergate_api/apps/job_submissions/properties_parser.py index 25ed71e9..d2c11b87 100644 --- a/jobbergate-api/jobbergate_api/apps/job_submissions/properties_parser.py +++ b/jobbergate-api/jobbergate_api/apps/job_submissions/properties_parser.py @@ -78,7 +78,7 @@ class SbatchToSlurm: SbatchToSlurm("", "--clusters", "-M"), SbatchToSlurm("comment", "--comment"), SbatchToSlurm("constraints", "--constraint", "-C"), - SbatchToSlurm("", "--container"), + SbatchToSlurm("container", "--container"), SbatchToSlurm("", "--contiguous", "", dict(action="store_const", const=True)), SbatchToSlurm("core_specification", "--core-spec", "-S", dict(type=int)), SbatchToSlurm("cores_per_socket", "--cores-per-socket", "", dict(type=int)), diff --git a/jobbergate-api/jobbergate_api/apps/job_submissions/schemas.py b/jobbergate-api/jobbergate_api/apps/job_submissions/schemas.py index 55dd26a1..9eef99da 100644 --- a/jobbergate-api/jobbergate_api/apps/job_submissions/schemas.py +++ b/jobbergate-api/jobbergate_api/apps/job_submissions/schemas.py @@ -106,6 +106,7 @@ class JobProperties(BaseModel, extra=Extra.forbid): ) comment: Optional[str] = Field(description="An arbitrary comment.") constraints: Optional[str] = Field(description="node features required by job.") + container: Optional[str] = Field(description="Absolute path to OCI container bundle.") core_specification: Optional[int] = Field( description=( "Count of specialized threads per node reserved by the job for system " diff --git a/jobbergate-composed/docker-compose.yml b/jobbergate-composed/docker-compose.yml index ea1be4a5..bd50aa3d 100644 --- a/jobbergate-composed/docker-compose.yml +++ b/jobbergate-composed/docker-compose.yml @@ -156,7 +156,7 @@ services: retries: 5 minio: - image: minio/minio + image: minio/minio:RELEASE.2023-10-25T06-33-25Z networks: - jobbergate-net volumes: