From 35c96034a71aafd932f11032edc65322d1633c61 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 24 Oct 2016 01:21:36 -0400 Subject: [PATCH] Re-enable mysql testing and install GPG version 1. --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa3e214c59..e3a0743f80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,25 @@ image: python:2.7 services: - - mysql + - mysql:latest - postgres 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 libreoffice + - apt-get install -qq python-dev gcc gnupg1 tesseract-ocr tesseract-ocr-deu ghostscript libjpeg-dev libpng-dev libtiff-dev poppler-utils libreoffice variables: POSTGRES_DB: "mayan_edms" POSTGRES_PASSWORD: "postgres" MYSQL_ALLOW_EMPTY_PASSWORD: "yes" MYSQL_DATABASE: "mayan_edms" -#test:mysql: -# script: -# - pip install -r requirements/testing.txt -# - pip install -q mysql-python -# - apt-get install -qq mysql-client -# - mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD" -e "ALTER DATABASE $MYSQL_DATABASE CHARACTER SET utf8 COLLATE utf8_unicode_ci;" -# - coverage run manage.py runtests --settings=mayan.settings.testing.gitlab-ci.db_mysql --nomigrations -# - bash <(curl https://raw.githubusercontent.com/codecov/codecov-bash/master/codecov) -t $CODECOV_TOKEN -# tags: -# - mysql +test:mysql: + script: + - pip install -r requirements/testing.txt + - pip install -q mysql-python + - apt-get install -qq mysql-client + - mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD" -e "ALTER DATABASE $MYSQL_DATABASE CHARACTER SET utf8 COLLATE utf8_unicode_ci;" + - coverage run manage.py runtests --settings=mayan.settings.testing.gitlab-ci.db_mysql --nomigrations + - bash <(curl https://raw.githubusercontent.com/codecov/codecov-bash/master/codecov) -t $CODECOV_TOKEN + tags: + - mysql test:postgres: script: - pip install -r requirements/testing.txt