From e65594494e4143304702584468c31e0a633b37c1 Mon Sep 17 00:00:00 2001
From: Carl Mai <carl.mai@tu-dresden.de>
Date: Thu, 19 Jul 2018 11:07:14 +0200
Subject: [PATCH] ci run a job for each test
---
.gitlab-ci.yml | 55 +++++++++++++++++++++++++++++++++++++++++++++-----
Dockerfile | 10 ++-------
2 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e23484..73c170f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,26 +31,71 @@ test_benchmark:
- dockered
script:
- docker pull $CONTAINER_TEST_IMAGE
- - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew benchmarkFull -Pscenario=0,small 2>&1 | tee benchmarkFull.log
+ - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon benchmarkFull -Pscenario=0,small 2>&1 | tee benchmarkFull.log
- grep -v "BUILD FAILED" benchmarkFull.log
-test_unit_tests_genetic:
+test_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
+ - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-genetic:test
-test_unit_tests:
+test_aco:
stage: test
tags:
- dockered
+ allow_failure: true
+ script:
+ - docker pull $CONTAINER_TEST_IMAGE
+ - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-aco:test
+
+# test_emfer:
+# stage: test
+# tags:
+# - dockered
+# allow_failure: true
+# script:
+# - docker pull $CONTAINER_TEST_IMAGE
+# - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-emfer:test
+
+test_ilp:
+ stage: test
+ tags:
+ - dockered
+ allow_failure: true
+ script:
+ - docker pull $CONTAINER_TEST_IMAGE
+ - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-ilp:test
+
+test_random:
+ stage: test
+ tags:
+ - dockered
+ allow_failure: true
+ script:
+ - docker pull $CONTAINER_TEST_IMAGE
+ - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-random:test
+
+test_simple:
+ stage: test
+ tags:
+ - dockered
+ allow_failure: true
script:
- docker pull $CONTAINER_TEST_IMAGE
- - docker run $CONTAINER_TEST_IMAGE /bin/bash -c 'echo "test.enabled = false" >> /ttc18/jastadd-mquat-solver-genetic/build.gradle && /ttc18/gradlew test'
+ - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-simple:test
+# test_unit_tests:
+# stage: test
+# tags:
+# - dockered
+# script:
+# - docker pull $CONTAINER_TEST_IMAGE
+# - docker run $CONTAINER_TEST_IMAGE /bin/bash -c 'echo "test.enabled = false" >> /ttc18/jastadd-mquat-solver-genetic/build.gradle && /ttc18/gradlew --no-daemon test'
+#
release-image:
stage: release
tags:
diff --git a/Dockerfile b/Dockerfile
index 710f68d..d4f18e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,14 +58,8 @@ 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 sed -i 's/MINUTES/SECONDS/g' jastadd-mquat-benchmark/src/main/resources/scenarios.json
# then build
-RUN ./gradlew --no-daemon assemble
-RUN ./gradlew --no-daemon compileTestJava
-RUN ./gradlew --no-daemon compileJava
-
-#RUN ./gradlew test
-#RUN ./gradlew benchmarkFull -Pscenario=0,small
-#RUN ./gradlew jastadd-mquat-solver-random:test
+RUN ./gradlew --no-daemon assemble compileTestJava
--
GitLab