From 76f320faf5f67d90503610d71256c826aaddbab9 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 15 May 2019 14:28:15 -0400 Subject: [PATCH] Ensure gnupg1 is used for gitlab testing Signed-off-by: Roberto Rosario --- .gitlab-ci.yml | 2 +- mayan/settings/testing/gitlab-ci/base.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a010e43b43..e8a4bfd176 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,7 +152,7 @@ job_push_python: - locale-gen en_US.UTF-8 - update-locale LANG=en_US.UTF-8 - export LC_ALL=en_US.UTF-8 - - apt-get install -qq curl exiftool gcc ghostscript gpgv gnupg1 graphviz libfuse2 libjpeg-dev libmagic1 libpng-dev libtiff-dev poppler-utils libreoffice poppler-utils python-dev python-pip tesseract-ocr tesseract-ocr-deu + - apt-get install -qq curl exiftool gcc ghostscript gnupg1 graphviz libfuse2 libjpeg-dev libmagic1 libpng-dev libtiff-dev poppler-utils libreoffice poppler-utils python-dev python-pip tesseract-ocr tesseract-ocr-deu - pip install -r requirements/testing.txt only: - releases/all diff --git a/mayan/settings/testing/gitlab-ci/base.py b/mayan/settings/testing/gitlab-ci/base.py index 547560962b..738748eb99 100644 --- a/mayan/settings/testing/gitlab-ci/base.py +++ b/mayan/settings/testing/gitlab-ci/base.py @@ -2,4 +2,5 @@ from __future__ import unicode_literals from ..base import * # NOQA -SIGNATURES_GPG_PATH = '/usr/bin/gpg' +SIGNATURES_GPG_PATH = '/usr/bin/gpg1' +