fixup! fixup! [Jenkins] Run benchmarks (with <test_definition>) in co…

…ntainer.
ufz · Sep 5, 2019 · cd06849 · cd06849
1 parent 1565bd3
commit cd06849
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,3 @@
 # .git
 Tests/Data
+_out/images
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -89,18 +89,17 @@ pipeline {
           agent { label 'docker && singularity'}
           steps {
             script {
-              sh """git submodule update --init ThirdParty/container-maker
+              sh '''git submodule update --init ThirdParty/container-maker
                 virtualenv .venv
                 source .venv/bin/activate
                 pip install -r ThirdParty/container-maker/requirements.txt
                 export PYTHONPATH="$PYTHONPATH:$PWD/ThirdParty/container-maker"
-                # python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs . --pm system --cvode --ompi off --cmake_args ' -DOGS_BUILD_PROCESSES=GroundwaterFlow'
-                cd _out
-                SIF=${find images -name "*-serial-*.sif" -print -quit}
-                for line in \${find ../Tests/Data -name '*.prj' -exec grep -H '<test_definition>' {} \\; | head -n 10 | cut -d: -f1}; do
-                  singularity exec $SIF scif run ogs $line -o ${pwd} -r ${line%/*}
+                python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs . --pm system --cvode --ompi off
+                SIF=$(find _out/images -name '*-serial-*.sif' -print -quit)
+                for line in $(find $PWD/Tests/Data -name '*.prj' -exec grep -H '<test_definition>' {} + | head -n 10 | cut -d: -f1); do
+                  singularity exec $SIF scif run ogs $line -o $PWD -r $(dirname $line)
                 done
-              """.stripIndent()
+              '''.stripIndent()
             }
           }
           post {