Resolve "Split tests into service-based and normal tests"

Closes #34 (closed)

.gitlab-ci.yml

@@ -12,10 +12,13 @@ variables:
 #  # Improve performance with overlayfs.
 #  DOCKER_DRIVER: overlay2
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"
-  TEST_REPORTS: "/builds/OpenLicht/eraser/eraser-base/build/reports/tests/test/"
-  TEST_LOG: "/builds/OpenLicht/eraser/eraser-base/logs/eraser-test.log"
-  JACOCO_REPORT: "/builds/OpenLicht/eraser/eraser-base/build/reports/jacoco/test/jacocoTestReport.xml"
-  TESTCONTAINERS_RYUK_DISABLED: "true"
+  TEST_REPORTS: "eraser-base/build/reports/tests/"
+  TEST_LOG: "eraser-base/logs/eraser-test.log"
+  JACOCO_REPORT: "*/build/reports/jacoco/all-tests/jacoco*Report.xml"
+  # settings for influxdb
+  INFLUXDB_DB: "jastaddHistory"
+  INFLUXDB_USER: "root"
+  INFLUXDB_USER_PASSWORD: "root"
 
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
@@ -29,7 +32,7 @@ build:
   image: openjdk:8
   stage: build
   script:
-    - ./gradlew --console=plain --build-cache assemble
+    - ./gradlew --console=plain assemble
   artifacts:
     paths:
       - "eraser-base/src/gen"
@@ -39,10 +42,15 @@ test:
   tags:
     - docker
   stage: test
+  services:
+    - name: "eclipse-mosquitto:1.6.12"
+      alias: "mqtt"
+    - name: "influxdb:1.8.4"
+      alias: "influx"
   needs:
     - build
   script:
-    - ./gradlew --continue --console=plain --info check jacocoTestReport
+    - ./gradlew --console=plain --info allTests
   artifacts:
     when: always
     paths:
@@ -56,7 +64,6 @@ coverage:
   needs:
     - test
   script:
-#    - ./gradlew --continue --console=plain -x test jacocoTestReport
     - pip install --user untangle
     - python print-coverage.py
   coverage: "/Covered (\\d{1,3}\\.\\d{2}%) of instructions for all projects\\./"