small changes to SLURM test

bgruening · Mar 25, 2018 · 095cbac · 095cbac
1 parent a6dc89e
commit 095cbac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/test/slurm/startup.sh b/test/slurm/startup.sh
@@ -18,6 +18,7 @@ if [ ! -f "$SLURM_CONF_PATH" ]
   then
     python /usr/local/bin/configure_slurm.py
     cp /etc/slurm-llnl/slurm.conf "$SLURM_CONF_PATH"
+    rm /etc/slurm-llnl/slurm.conf
 fi
 if [ ! -f "$GALAXY_DIR"/.venv ]
   then

diff --git a/test/slurm/test.sh b/test/slurm/test.sh
@@ -18,7 +18,7 @@ docker run -d -e "NONUSE=slurmd,slurmctld" \
    --link slurm --name galaxy-slurm-test -h galaxy \
    -p 80:80 -v "$EXPORT":/export quay.io/bgruening/galaxy
 # We wait for the creation of the /galaxy-central/config/ if it does not exist yet
-sleep 60s
+sleep 180s
 # We restart galaxy
 docker stop galaxy-slurm-test
 docker rm galaxy-slurm-test
@@ -32,7 +32,7 @@ docker run -d -e "NONUSE=slurmd,slurmctld" \
    -p 80:80 -v "$EXPORT":/export quay.io/bgruening/galaxy
 # Let's submit a job from the galaxy container and check it runs in the slurm container
 sleep 60s
-docker exec galaxy-slurm-test su - galaxy -c 'srun hostname' | grep slurm && \
-docker stop galaxy-slurm-test slurm && \
+docker exec galaxy-slurm-test su - galaxy -c 'srun hostname' | grep slurm
+docker stop galaxy-slurm-test slurm
 docker rm galaxy-slurm-test slurm
 # TODO: Run a galaxy tool and check it runs on the cluster