From 877b858fa3ae0d9637613ef84b670d080808a4a7 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Thu, 26 Sep 2019 16:54:38 +0000
Subject: [PATCH] Use the Docker runner images on Docker Hub

---
 .gitlab-ci.yml | 50 +++++++++-----------------------------------------
 1 file changed, 9 insertions(+), 41 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1357239e1..17cf7941d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,67 +4,35 @@ stages:
 
 lint:
   stage: lint
-  image: python
+  image: openlp/debian
   before_script:
-    - apt-get update
-    # packages required for dbus-python
-    - apt-get -y install libdbus-1-dev libdbus-glib-1-dev
-    # packages required for pyodbc
-    - apt-get -y install unixodbc unixodbc-dev
-    - pip install -e .[test]
+    - sh scripts/generate_resources.sh
   script:
     - flake8
 
 test-debian:
   stage: test
-  variables:
-    DEBIAN_FRONTEND: noninteractive
-  image: debian:unstable
+  image: openlp/debian
   before_script:
-    - apt-get update
-    - apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia
-                         python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebkit
-                         python3-pyqt5.qtwebengine python3-dbus.mainloop.pyqt5 python3-sqlalchemy python3-alembic
-                         python3-chardet python3-lxml python3-enchant python3-bs4 python3-mako python3-uno
-                         python3-pytest python3-pytest-cov python3-websockets python3-webob python3-waitress
-                         python3-requests python3-pymediainfo python3-qtawesome python3-opengl python3-appdirs
-                         python3-vlc python3-zeroconf python3-pip python3-pep8 mediainfo mupdf-tools xvfb
     - sh scripts/generate_resources.sh
   script:
-    - xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py --cov openlp --cov-report term --cov-report html
+    - xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py --cov openlp --cov-report term --cov-report html
 
 test-ubuntu:
   stage: test
-  variables:
-    DEBIAN_FRONTEND: noninteractive
-  image: ubuntu:rolling
+  image: openlp/ubuntu
   before_script:
-    - apt-get update
-    - apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia
-                         python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebkit
-                         python3-pyqt5.qtwebengine python3-dbus.mainloop.pyqt5 python3-sqlalchemy python3-alembic
-                         python3-chardet python3-lxml python3-enchant python3-bs4 python3-mako python3-uno
-                         python3-pytest python3-pytest-cov python3-websockets python3-webob python3-waitress
-                         python3-requests python3-pymediainfo python3-qtawesome python3-opengl python3-appdirs
-                         python3-vlc python3-zeroconf python3-pip python3-pep8 mediainfo mupdf-tools xvfb
     - sh scripts/generate_resources.sh
   script:
-    - xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
+    - xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
 
 test-fedora:
   stage: test
-  image: fedora
+  image: openlp/fedora
   before_script:
-    - dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
-                     https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-    - dnf install -y python3-PyQt5 python3-qt5-webkit python3-qt5-webengine python3-sqlalchemy python3-alembic
-                     python3-beautifulsoup4 python3-chardet python3-enchant python3-lxml python3-pyxdg python3-pytest
-                     python3-websockets python3-appdirs python3-webob python3-QtAwesome python3-waitress python3-vlc
-                     python3-pymediainfo python3-pyopengl python-pysword python3-requests python3-zeroconf mediainfo
-                     patch xorg-x11-server-Xvfb ghostscript mupdf
     - sh scripts/generate_resources.sh
   script:
-    - xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
+    - xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
 
 test-macos:
   stage: test
@@ -74,6 +42,6 @@ test-macos:
     - export PATH=/opt/local/bin:$PATH
     - sh scripts/generate_resources.sh
   script:
-    - python3 -m pytest -v --color=no --disable-warnings --ignore=tests/utils
+    - python3 -m pytest --color=no --disable-warnings
   only:
     - master@openlp/openlp