From 5de06ab8d93462a2c8903562eb6de8008a181b54 Mon Sep 17 00:00:00 2001
From: Sven Marcus <s.marcus@outlook.de>
Date: Tue, 13 Apr 2021 16:23:23 +0200
Subject: [PATCH] Add needs to slurm CI job

---
 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b8d85b5e..96976eacf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -240,7 +240,8 @@ gcc_9_python_bindings_test:
 gcc_9_python_slurm_test:
   stage: test
 
-#  when: manual
+  when: manual
+  needs: ["gcc_9_python"]
 
   tags:
     - linux
@@ -260,19 +261,19 @@ gcc_9_python_slurm_test:
     - echo "$SSH_KEY" | tr -d '\r' | ssh-add -
     - echo $SSH_KEY >> ansible/private_key
     - ssh-keyscan -t rsa $HOST >> ~/.ssh/known_hosts
+    - ssh $PHOENIX_USER@$HOST "rm -rf output-*"
+    - ssh $PHOENIX_USER@$HOST "rm -f *.out"
 
   script:
     - singularity build PoiseuilleTestContainer.sif Python/SlurmTests/poiseuille/PoiseuilleTestContainer.def
     - scp PoiseuilleTestContainer.sif $PHOENIX_USER@$HOST:PoiseuilleTestContainer.sif
     - scp Python/SlurmTests/poiseuille/slurm.job $PHOENIX_USER@$HOST:slurm.job
-    - ssh $PHOENIX_USER@$HOST "rm -rf output-*"
-    - ssh $PHOENIX_USER@$HOST "rm *.out"
     - ssh $PHOENIX_USER@$HOST "sbatch --wait slurm.job"
     - cat *.out
 
   after_script:
     - ssh $PHOENIX_USER@$HOST "rm -rf output-*"
-    - ssh $PHOENIX_USER@$HOST "rm *.out"
+    - ssh $PHOENIX_USER@$HOST "rm -f *.out"
     - ssh $PHOENIX_USER@$HOST "rm PoiseuilleTestContainer.sif"
     - ssh $PHOENIX_USER@$HOST "rm slurm.job"
 
-- 
GitLab