diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 142dc0bfca26eb14be51f9c96c5f09ef6e15df49..b4de15eaab7f4fec7d6881e0c9e5e2cdb8dc4c3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,12 +34,22 @@ test_benchmark: - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew benchmarkFull -Pscenario=0,small 2>&1 | tee benchmarkFull.log - grep -v "BUILD FAILED" benchmarkFull.log +test_unit_tests_genetic: + stage: test + tags: + - dockered + allow_failure: true + script: + - docker pull $CONTAINER_TEST_IMAGE + - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew jastadd-mquat-solver-genetic:test + test_unit_tests: stage: test tags: - dockered script: - docker pull $CONTAINER_TEST_IMAGE + - echo "test.enabled = false" >> /ttc18/jastadd-mquat-solver-genetic/build.gradle - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew test release-image: diff --git a/Dockerfile b/Dockerfile index 4681ef2db8338cbce57a22f44eb9ad27e226b39c..f726ef825eb7a77801af2abf88401221745d93cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,6 @@ RUN echo "glpkPath = /usr/lib/x86_64-linux-gnu/jni" > gradle.properties #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-random/build.gradle RUN sed -i 's/MINUTES/SECONDS/g' jastadd-mquat-benchmark/src/main/resources/scenarios.json # then build