diff --git a/.gitignore b/.gitignore index e62d91439..d6e348963 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ coverage.xml *.cover .hypothesis/ .pytest_cache/ +unittest.xml # Translations *.mo @@ -184,7 +185,6 @@ dmypy.json [Ii]nclude [Ll]ib64 [Ll]ocal -[Ss]cripts pyvenv.cfg pip-selfcheck.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc160661b..6999b6284 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,9 +80,7 @@ pylint: - redis:latest coverage: script: - - coverage run --concurrency=multiprocessing manage.py test - - coverage combine - - coverage report + - ./scripts/coverage.sh stage: test services: - postgres:latest diff --git a/scripts/coverage.sh b/scripts/coverage.sh new file mode 100755 index 000000000..61f10d820 --- /dev/null +++ b/scripts/coverage.sh @@ -0,0 +1,5 @@ +#!/bin/bash -xe +coverage run --concurrency=multiprocessing manage.py test +coverage combine +coverage html +coverage report diff --git a/hack/prometheus/grafana.helm.yaml b/scripts/prometheus/grafana.helm.yaml similarity index 100% rename from hack/prometheus/grafana.helm.yaml rename to scripts/prometheus/grafana.helm.yaml diff --git a/hack/prometheus/instance.yaml b/scripts/prometheus/instance.yaml similarity index 100% rename from hack/prometheus/instance.yaml rename to scripts/prometheus/instance.yaml diff --git a/hack/up.sh b/scripts/up.sh similarity index 100% rename from hack/up.sh rename to scripts/up.sh