Merge branch 'master' of git-st.inf.tu-dresden.de:stgroup/ttc18

.gitlab-ci.yml

@@ -32,7 +32,7 @@ test_benchmark:
   script:
     - docker pull $CONTAINER_TEST_IMAGE
     - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew benchmarkFull -Pscenario=0,small 2>&1 | tee benchmarkFull.log
-    - ! grep "BUILD FAILED" benchmarkFull.log
+    - grep "BUILD FAILED" benchmarkFull.log; test $? -eq 1
 
 test_unit_tests:
   stage: test

Dockerfile

@@ -56,7 +56,7 @@ RUN echo "glpkPath = /usr/lib/x86_64-linux-gnu/jni" > gradle.properties
 #RUN sed -i '/jastadd-mquat-solver-emfer/d' settings.gradle
 #RUN sed -i '/jastadd-mquat-solver-emfer/d' jastadd-mquat-benchmark/build.gradle
 #RUN sed -i '/EMFeRSolver/d' jastadd-mquat-benchmark/src/main/java/de/tudresden/inf/st/mquat/benchmark/SolverFactory.java
-RUN echo "test.enabled = false" > ./jastadd-mquat-solver-emfer/build.gradle
+RUN echo "test.enabled = false" >> ./jastadd-mquat-solver-emfer/build.gradle
 #RUN echo "test.enabled = false" > ./jastadd-mquat-solver-random/build.gradle
 RUN sed -i 's/MINUTES/SECONDS/g' jastadd-mquat-benchmark/src/main/resources/scenarios.json