From b739ae7559ae3288f0c9f118ba4a21ea2018dbc8 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Mon, 19 Apr 2021 18:10:34 +0200
Subject: [PATCH] merge test and benchmark job

---
 .gitlab-ci.yml | 36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcdd0f2..8d5e3f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,6 @@
 stages:
-  - models
   - build
   - test
-  - benchmark
 
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
@@ -13,53 +11,25 @@ cache:
     - .gradle/caches
     - ttc2018liveContest
 
-prepareTTCrepo:
-  # use same image as other jobs, and it has git already available
-  image: openjdk:11
-  stage: models
-  script:
-    - "[ -d ttc2018liveContest ] || git clone --depth=1 https://github.com/TransformationToolContest/ttc2018liveContest.git ttc2018liveContest"
-    - "( cd ttc2018liveContest && git pull )"
-    - ln -sf ../../../../ttc2018liveContest/models solve/src/test/resources
-#  artifacts:
-#    paths:
-#      - "ttc2018liveContest/models"
-#      - "solve/src/test/resources/models"
-#      - "solve/src/test/resources/models/1"
-#      - "solve/src/test/resources/models/2"
-#      - "solve/src/test/resources/models/32"
-
 build:
   image: openjdk:11
   stage: build
   script:
     - ./gradlew --console=plain assemble
 
-test:
+testAndBenchmark:
   image: openjdk:11
   stage: test
   needs:
     - build
-    - prepareTTCrepo
   script:
+    - "[ -d ttc2018liveContest ] || git clone --depth=1 https://github.com/TransformationToolContest/ttc2018liveContest.git ttc2018liveContest"
     - ln -sf ../../../../ttc2018liveContest/models solve/src/test/resources
-    - ls solve/src/test/resources/models
     - ./gradlew --console=plain test
+    - ./all-timed-benchmark.sh
   artifacts:
     when: always
     reports:
       junit: "*/build/test-results/test/**/TEST-*.xml"
-
-timing:
-  image: openjdk:11
-  stage: benchmark
-  needs:
-    - build
-    - prepareTTCrepo
-  script:
-    - ln -sf ../../../../ttc2018liveContest/models solve/src/test/resources
-    - ls solve/src/test/resources/models
-    - ./all-timed-benchmark.sh
-  artifacts:
     paths:
       - results/
-- 
GitLab