Commit 6bfd5ad3 authored by Andreas Marek's avatar Andreas Marek
Browse files

Bugfix to gitlab ci

parent 50523869
...@@ -9,7 +9,7 @@ before_script: ...@@ -9,7 +9,7 @@ before_script:
- ulimit -v unlimited - ulimit -v unlimited
- echo "HOST " $(hostname) - echo "HOST " $(hostname)
- echo $CI_RUNNER_DESCRIPTION - echo $CI_RUNNER_DESCRIPTION
- export SLURM=yes - export SLURM=no
- if [ "$(hostname)" = "buildtest-rzg" ]; then module purge && module load git && module list && export INTERACTIVE_RUN=yes && export SLURM=no && source ./ci_test_scripts/.ci-env-vars; fi - if [ "$(hostname)" = "buildtest-rzg" ]; then module purge && module load git && module list && export INTERACTIVE_RUN=yes && export SLURM=no && source ./ci_test_scripts/.ci-env-vars; fi
- if [ "$(hostname)" = "amarek-elpa-gitlab-runner-1" ]; then module purge && module load git && module list && export INTERACTIVE_RUN=yes && export SLURM=no && source ./ci_test_scripts/.ci-env-vars; fi - if [ "$(hostname)" = "amarek-elpa-gitlab-runner-1" ]; then module purge && module load git && module list && export INTERACTIVE_RUN=yes && export SLURM=no && source ./ci_test_scripts/.ci-env-vars; fi
- if [ "$(hostname)" = "amarek-elpa-gitlab-runner-2" ]; then module purge && module load git && module list && export INTERACTIVE_RUN=yes && export SLURM=no && source ./ci_test_scripts/.ci-env-vars; fi - if [ "$(hostname)" = "amarek-elpa-gitlab-runner-2" ]; then module purge && module load git && module list && export INTERACTIVE_RUN=yes && export SLURM=no && source ./ci_test_scripts/.ci-env-vars; fi
......
...@@ -13,6 +13,7 @@ configueArg="" ...@@ -13,6 +13,7 @@ configueArg=""
skipStep=0 skipStep=0
batchCommand="" batchCommand=""
interactiveRun="yes" interactiveRun="yes"
SLURMBATCH="no"
function usage() { function usage() {
cat >&2 <<-EOF cat >&2 <<-EOF
...@@ -58,7 +59,7 @@ function usage() { ...@@ -58,7 +59,7 @@ function usage() {
} }
while getopts "c:t:j:m:n:b:o:s:q:i:h" opt; do while getopts "c:t:j:m:n:b:o:s:q:S:i:h" opt; do
case $opt in case $opt in
j) j)
makeTasks=$OPTARG;; makeTasks=$OPTARG;;
...@@ -80,6 +81,8 @@ while getopts "c:t:j:m:n:b:o:s:q:i:h" opt; do ...@@ -80,6 +81,8 @@ while getopts "c:t:j:m:n:b:o:s:q:i:h" opt; do
batchCommand=$OPTARG;; batchCommand=$OPTARG;;
i) i)
interactiveRun=$OPTARG;; interactiveRun=$OPTARG;;
S)
SLURMBATCH=$OPTARG;;
:) :)
echo "Option -$OPTARG requires an argument" >&2;; echo "Option -$OPTARG requires an argument" >&2;;
h) h)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment