From 8c37bd87d64b7f965cae96011fe24c078a46a3c0 Mon Sep 17 00:00:00 2001 From: Michael Price Date: Thu, 22 Feb 2018 22:00:29 -0400 Subject: [PATCH] GitLab CI testing with Ubuntu 16.10 is failing. Fallback to Ubuntu 16.04. Signed-off-by: Michael Price --- .gitlab-ci.yml | 4 ++-- mayan/settings/testing/gitlab-ci/base.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1cccdbe1eb..55704aae01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: ubuntu:16.10 +image: ubuntu:16.04 services: - mysql:latest - postgres @@ -8,7 +8,7 @@ before_script: - update-locale LANG=en_US.UTF-8 - export LC_ALL=en_US.UTF-8 - apt-get update -qq - - apt-get install -qq curl graphviz python-dev python-pip gcc gnupg1 tesseract-ocr tesseract-ocr-deu ghostscript libjpeg-dev libpng-dev libtiff-dev poppler-utils libreoffice + - apt-get install -qq curl graphviz python-dev python-pip gcc tesseract-ocr tesseract-ocr-deu ghostscript libjpeg-dev libpng-dev libtiff-dev poppler-utils libreoffice variables: POSTGRES_DB: "mayan_edms" POSTGRES_PASSWORD: "postgres" diff --git a/mayan/settings/testing/gitlab-ci/base.py b/mayan/settings/testing/gitlab-ci/base.py index eb890b44b0..d39164d3dd 100644 --- a/mayan/settings/testing/gitlab-ci/base.py +++ b/mayan/settings/testing/gitlab-ci/base.py @@ -2,4 +2,3 @@ from __future__ import unicode_literals from ..base import * # NOQA -SIGNATURES_GPG_PATH = '/usr/bin/gpg1'