From efd023ae3a80071123a39b9b360fbef09402140e Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Tue, 14 Mar 2023 09:35:44 +0100
Subject: [PATCH] a bit of formatting and naming

---
 .gitlab-ci.yml | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a43d49..db973c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,46 +1,42 @@
 stages:
-  - Test
-  - AdditionalTests
+  - Tests
+  - OptionalTests
 
 .install-grum-test: &install-grum-test
-    - pip install pytest pytest-random-order pytest-cov
-    - pip install -e ./
-
-    - apt-get update
-    - apt-get install -y ffmpeg libnss3 libxcomposite1 libxtst6
+  - pip install pytest pytest-random-order pytest-cov
+  - pip install -e ./
+  - apt-get update
+  - apt-get install -y ffmpeg libnss3 libxcomposite1 libxtst6
 
 tests:
-  stage: Test
+  stage: Tests
+  image: python:3.8
   variables:
     QT_QPA_PLATFORM: "offscreen"
     XDG_RUNTIME_DIR: "/tmp/runtime-root"
-
   script:
     - *install-grum-test
-
     - coverage run --source=./grum -m pytest ./tests
     - coverage report
     - coverage xml
-
   coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
   artifacts:
     reports:
       cobertura: coverage.xml
 
 tests-3.9:
-  stage: AdditionalTests
+  stage: OptionalTests
   image: python:3.9
   needs: ["tests"]
   allow_failure: true
   variables:
     QT_QPA_PLATFORM: "offscreen"
-    XDG_RUNTIME_DIR: "/tmp/runtime-root"  
+    XDG_RUNTIME_DIR: "/tmp/runtime-root"
   script: 
     - *install-grum-test
     - pytest ./tests
 
 tests-3.10:
   extends: "tests-3.9"
-  stage: AdditionalTests
   image: python:3.10
-  allow_failure: true
+