Merge pull request #124 from biomage-org/staging-batch-jobdef

[BIOMAGE-2328] - Add sandbox id to batch jobdef
hms-dbmi-cellenics · Mar 7, 2023 · eab5c2e · eab5c2e
2 parents fb04e41 + 35b1ed5
commit eab5c2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/api.v2/helpers/pipeline/pipelineConstruct/constructors/submitBatchJob.js b/src/api.v2/helpers/pipeline/pipelineConstruct/constructors/submitBatchJob.js
@@ -16,7 +16,7 @@ const submitBatchJob = (context, step) => {
     Type: 'Task',
     Resource: 'arn:aws:states:::batch:submitJob',
     Parameters: {
-      JobDefinition: `job-pipeline-${environment}`,
+      JobDefinition: `job-pipeline-${environment}-${config.sandboxId}`,
       JobName: `${environment}-${experimentId}-${processName}`, // changing the name will break job termination when a new one is submitted
       JobQueue: `queue-pipeline-${environment}`,
       ContainerOverrides: {

diff --git a/tests/api.v2/helpers/pipeline/__snapshots__/stateMachineSkeletons.test.js.snap b/tests/api.v2/helpers/pipeline/__snapshots__/stateMachineSkeletons.test.js.snap
@@ -1480,7 +1480,7 @@ exports[`non-tests to document the State Machines - qc production with specific
       "Type": "Task",
       "Resource": "arn:aws:states:::batch:submitJob",
       "Parameters": {
-        "JobDefinition": "job-pipeline-production",
+        "JobDefinition": "job-pipeline-production-default",
         "JobName": "production-mock-experiment-id-qc",
         "JobQueue": "queue-pipeline-production",
         "ContainerOverrides": {