From 32b7ec3e1467396db33ea31c958768c9a22e517c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 25 Sep 2015 00:00:09 -0400 Subject: [PATCH] Simplify gitlab-ci file. Merge jobs. --- .gitlab-ci.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 521457e104..c1b5419c28 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,26 +6,18 @@ 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 stages: - - build - test -job1: - stage: build - script: - - pip install -r requirements/testing.txt - - pip install -q mysql-python - - pip install -q psycopg2 - only: - - development -job2: +job_test: stage: test script: + - pip install -r requirements/testing.txt + - pip install -q mysql-python + - pip install -q psycopg2 - 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.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"