From 4f3abf2cce9a2b751a076335abc25b67ab761fd4 Mon Sep 17 00:00:00 2001 From: Carl Mai <carl.mai@tu-dresden.de> Date: Thu, 19 Jul 2018 11:16:33 +0200 Subject: [PATCH] removed allow_failure from some tests --- .dockerignore | 2 ++ .gitlab-ci.yml | 17 ++++------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.dockerignore b/.dockerignore index a07ffe8..4e9c652 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,5 @@ +.git +.gitignore .gitlab-ci.yaml Dockerfile README.md diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73c170f..cff38f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ test_genetic: stage: test tags: - dockered - allow_failure: true + allow_failure: true # too random script: - docker pull $CONTAINER_TEST_IMAGE - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-genetic:test @@ -47,11 +47,12 @@ test_aco: stage: test tags: - dockered - allow_failure: true + allow_failure: true # too random script: - docker pull $CONTAINER_TEST_IMAGE - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-aco:test +# was never working # test_emfer: # stage: test # tags: @@ -65,7 +66,6 @@ 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 @@ -74,7 +74,7 @@ test_random: stage: test tags: - dockered - allow_failure: true + # allow_failure: true - not needed because it is seeded script: - docker pull $CONTAINER_TEST_IMAGE - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-random:test @@ -83,19 +83,10 @@ test_simple: 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-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: -- GitLab