diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3f83b6a..205e7eb0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: python:3.6-slim stages: - test style - validate format -## - test stories + - test stories - build requirements - build coach - build @@ -29,17 +29,17 @@ run dataset validator: - cd coach/ - make run-validator -#test stories: -# stage: test stories -# image: docker -# tags: -# - docker -# services: -# - docker:dind -# script: -# - docker build . -f docker/bot/coach.Dockerfile -t lappis/coach:latest > /dev/null 2>&1 -# - docker build -f docker/bot/bot.Dockerfile -t lappis/bot:latest . -# - docker run --rm lappis/bot:latest make test-stories +test stories: + stage: test stories + image: docker + tags: + - docker + services: + - docker:dind + script: + - docker build . -f docker/bot/coach.Dockerfile -t lappis/coach:latest > /dev/null 2>&1 + - docker build -f docker/bot/bot.Dockerfile -t lappis/bot:latest . + - docker run --rm lappis/bot:latest make test-stories build requirements: stage: build requirements diff --git a/bot/Makefile b/bot/Makefile index 4c700ffc..84ac6809 100644 --- a/bot/Makefile +++ b/bot/Makefile @@ -24,9 +24,6 @@ e2e: python3 -m rasa_core.evaluate default --core /models/dialogue --nlu /models/nlu/current --stories e2e/e2e_stories_1.md --e2e python3 -m rasa_core.evaluate default --core /models/dialogue --nlu /models/nlu/current --stories e2e/e2e_stories_2.md --e2e -e2e-test: - python3 -m rasa_core.evaluate default --core /models/dialogue --nlu /models/nlu/current --stories e2e/e2e_stories_erro.md --e2e - test-stories: python3 test_stories.py --stories e2e/e2e_stories_1.md --e2e python3 test_stories.py --stories e2e/e2e_stories_2.md --e2e