From 0cea7c7addb923399475f9f9d113acd37ad76b57 Mon Sep 17 00:00:00 2001
From: Julian Rother <julian@cccv.de>
Date: Thu, 19 Oct 2023 23:36:32 +0200
Subject: [PATCH] CI cleanup

---
 .gitlab-ci.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8821daf..47721f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ linter:buster:
   image: registry.git.cccv.de/uffd/docker-images/buster
   stage: test
   script:
-  - pip3 install pylint-gitlab
+  - pip3 install $PYLINT_PIN pylint-gitlab # this force-updates jinja2 and some other packages!
   - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabCodeClimateReporter app.py > codeclimate.json
   - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabPagesHtmlReporter app.py > pylint.html
   - python3 -m pylint --rcfile .pylintrc --output-format=text app.py
@@ -47,7 +47,7 @@ linter:bullseye:
   image: registry.git.cccv.de/uffd/docker-images/bullseye
   stage: test
   script:
-  - pip3 install pylint-gitlab
+  - pip3 install $PYLINT_PIN pylint-gitlab # this force-updates jinja2 and some other packages!
   - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabCodeClimateReporter app.py > codeclimate.json
   - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabPagesHtmlReporter app.py > pylint.html
   - python3 -m pylint --rcfile .pylintrc --output-format=text app.py
@@ -62,8 +62,7 @@ unittests:buster:
   image: registry.git.cccv.de/uffd/docker-images/buster
   stage: test
   script:
-  - service slapd start
-  - UNITTEST_OPENLDAP=1 python3-coverage run --include 'app.py' -m pytest --junitxml=report.xml || true
+  - python3-coverage run --include 'app.py' -m pytest --junitxml=report.xml || true
   - python3-coverage report -m
   - python3-coverage html
   - python3-coverage xml
@@ -84,8 +83,7 @@ unittests:bullseye:
   image: registry.git.cccv.de/uffd/docker-images/bullseye
   stage: test
   script:
-  - service slapd start
-  - UNITTEST_OPENLDAP=1 python3-coverage run --include 'app.py' -m pytest --junitxml=report.xml || true
+  - python3-coverage run --include 'app.py' -m pytest --junitxml=report.xml || true
   #- python3-coverage report -m
   - python3-coverage html
   #- python3-coverage xml
-- 
GitLab