From fa88869f1e923edf6c17bd9983ee8ecb858bd586 Mon Sep 17 00:00:00 2001
From: Felix Tomski <tomski@itc.rwth-aachen.de>
Date: Tue, 10 Oct 2023 15:26:06 +0200
Subject: [PATCH] Fix jobid of shared slurm job mode

---
 core/modes/slurm/shared.py    | 2 ++
 utility/.gitlab/.template.yml | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/modes/slurm/shared.py b/core/modes/slurm/shared.py
index 50166d3..7c4e9f6 100644
--- a/core/modes/slurm/shared.py
+++ b/core/modes/slurm/shared.py
@@ -69,6 +69,8 @@ class SingleSlurmJobAcrossStages(Slurm, ABC):
             additional_env.append(f"{k}={v}")
         if len(additional_env) != 0:
             parameters += f' --export=' + ",".join(additional_env)
+        if self.slurm_job_id:
+            parameters += f' --jobid={self.slurm_job_id}'
         return parameters
 
     def get_simple_run_wrapper(self):
diff --git a/utility/.gitlab/.template.yml b/utility/.gitlab/.template.yml
index 78a6160..97e339a 100644
--- a/utility/.gitlab/.template.yml
+++ b/utility/.gitlab/.template.yml
@@ -47,6 +47,7 @@ variables:
   variables:
     SLURM_PARAM_CPUS: "-c 2"
     CI_MODE: "SingleSlurmJobAcrossStages"
+    SLURM_PARAM_GPUS: "--gres=gpu:volta:2"
   parallel:
     matrix:
       - PARVAR_X: ['a', 'b']
@@ -64,7 +65,7 @@ variables:
 
 .partition-check:
   variables:
-    _PARTITION: "c18m"
+    _PARTITION: "c18g"
     SLURM_PARAM_PARTITION: "-p ${_PARTITION}"
   script:
     - echo "SLURM_JOB_PARTITION ${SLURM_JOB_PARTITION}"
@@ -137,6 +138,8 @@ single-build-job:
   extends: 
     - .sequential-job
     - .partition-check
+  variables:
+    _PARTITION: "c18m"
   script:
     - echo "JOBID ${SLURM_JOB_ID}"
     - echo "Building on $(hostname) into $TMP"
-- 
GitLab