diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 991697f5c3..386e20856b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,6 @@ services: before_script: - apt-get update -qq - apt-get install -qq python-dev gcc tesseract-ocr tesseract-ocr-deu unpaper ghostscript libjpeg-dev libpng-dev libtiff-dev poppler-utils - - mysql -u root -e 'create database mayan_edms;' - - psql -c 'create database mayan_edms;' -U postgres stages: - build - test @@ -23,8 +21,13 @@ job2: script: - export TEST_APPS="acls authentication checkouts django_gpg document_indexing document_signatures documents dynamic_search folders lock_manager ocr permissions sources tags" - coverage run manage.py test $TEST_APPS --settings=mayan.settings.testing.base - - coverage run manage.py test $TEST_APPS --settings=mayan.settings.testing.travis.db_mysql - - coverage run manage.py test $TEST_APPS --settings=mayan.settings.testing.travis.db_postgres + - coverage run manage.py test $TEST_APPS --settings=mayan.settings.testing.gitlab-ci.db_mysql + - coverage run manage.py test $TEST_APPS --settings=mayan.settings.testing.gitlab-ci.db_postgres - coveralls only: - development +variables: + POSTGRES_DB: mayan_edms + POSTGRES_PASSWORD: postgres + MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_DATABASE: mayan_edms diff --git a/mayan/settings/testing/gitlab-ci/__init__.py b/mayan/settings/testing/gitlab-ci/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/settings/testing/gitlab-ci/db_mysql.py b/mayan/settings/testing/gitlab-ci/db_mysql.py new file mode 100644 index 0000000000..cd66099209 --- /dev/null +++ b/mayan/settings/testing/gitlab-ci/db_mysql.py @@ -0,0 +1,11 @@ +from __future__ import unicode_literals + +from ..base import * # NOQA + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': 'mayan_edms', + 'USER': 'root', + } +} diff --git a/mayan/settings/testing/gitlab-ci/db_postgres.py b/mayan/settings/testing/gitlab-ci/db_postgres.py new file mode 100644 index 0000000000..cb9fa54457 --- /dev/null +++ b/mayan/settings/testing/gitlab-ci/db_postgres.py @@ -0,0 +1,12 @@ +from __future__ import unicode_literals + +from ..base import * # NOQA + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'mayan_edms', + 'USER': 'postgres', + 'PASSWORD': 'postgres', + } +}