diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5dd29a02ffdbd828286b5dd305c984dc988deb2..b308a021ac5b16948b30f25790d13771ea2e3d61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,15 @@ stages: - test - deploy -# run qunit tests and pylint +# run pylint +test: + tags: [ docker ] + stage: test + script: + - make pylint + allow_failure: true + +# run qunit tests test: tags: [ docker ] stage: test @@ -51,8 +59,8 @@ test: - public/qunit.log - screenlog.* script: - - make pylint - make run-qunit + allow_failure: true # Trigger building of server image and integration tests trigger_build: diff --git a/makefile b/makefile index 0aaadadb5bfeee61fe6cb51846854a5677778470..2c2be7e1dfef637fea0fa463394ce8852726779b 100644 --- a/makefile +++ b/makefile @@ -73,7 +73,8 @@ run-qunit: screen -L -S caosdb-webui-test -t server -d -m -A make run-test-server # start firefox - screen -S caosdb-webui-test -X screen -t firefox $(XVFB-RUN) firefox "http://localhost:$(PORT)/webinterface/index.html?loggerPort=$(PORT)" + screen -S caosdb-webui-test -X screen -t firefox $(XVFB-RUN) firefox \ + "http://localhost:$(PORT)/webinterface/index.html?loggerPort=$(PORT)" # wait until server stops while [ 1 -eq 1 ]; do \ diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index 3d053e62a367e759905728bd53a5d064b54321d5..204aa0803e4d92d7570119b2bfd9800c670d4cf0 100644 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -1,7 +1,7 @@ FROM debian:latest RUN apt-get update && \ apt-get install firefox-esr pylint3 python3-pip python3-httpbin git \ - curl -y + curl screen xvfb unzip -y RUN git clone -b dev https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \ cd caosdb-pylib && pip3 install .