diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 223bbf42050cc417f818f4e5a2ae8f60cb525e2f..f8d65bd5bed82a0c9a0c9c231b758cff3c09d69b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: .local-template: variables: - RUNNER_TAG: "custom2" + RUNNER_TAG: "ja664344" .run-template: stage: run diff --git a/core/utility/executor.py b/core/utility/executor.py index c807e91c9e28199eb096b01118fee309735a967f..681c57c466684b10f80d6ce995075c6d03db92fb 100644 --- a/core/utility/executor.py +++ b/core/utility/executor.py @@ -192,14 +192,12 @@ class Slurm_Executor(Executor, ABC): return scancel_out def run_direct(self, params="", wrapper_add="", script=""): - out = self.execute(helper_script=f"{self.job.scripts_path}/xPipeHelper.sh", + self.execute(helper_script=f"{self.job.scripts_path}/xPipeHelper.sh", allocator=self.get_srun_cmd(), params=f'{self.get_default_params()} {params}', target_script=script, - wrapper_add=wrapper_add, main_script=True, - text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout - logging.debug(out) - return out + wrapper_add=wrapper_add, main_script=True) + return '' def run_batched(self, params="", wrapper_add="", script=""): sbatch_out = self.execute(helper_script=f"{self.job.scripts_path}/xPipeHelper.sh",