Skip to content
Snippets Groups Projects
Commit f05dca21 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

Merge branch 'f-pipeline-python-versions' into 'dev'

F pipeline python versions

See merge request !73
parents b89c8a4e 658054f1
No related branches found
No related tags found
2 merge requests!79Release 0.10.0,!73F pipeline python versions
Pipeline #29833 passed
...@@ -54,7 +54,21 @@ pylint: ...@@ -54,7 +54,21 @@ pylint:
allow_failure: true allow_failure: true
# run unit tests # run unit tests
unittest: unittest_py3.8:
tags: [ docker ]
stage: test
needs: [ ]
image: python:3.8
script: &python_test_script
# Python docker has problems with tox and pip so use plain pytest here
- touch ~/.pycaosdb.ini
- pip install nose pytest pytest-cov python-dateutil jsonschema==4.0.1
- pip install .
- python -m pytest unittests
# This needs to be changed once Python 3.9 isn't the standard Python in Debian
# anymore.
unittest_py3.9:
tags: [ docker ] tags: [ docker ]
stage: test stage: test
needs: [ ] needs: [ ]
...@@ -62,6 +76,14 @@ unittest: ...@@ -62,6 +76,14 @@ unittest:
- touch ~/.pycaosdb.ini - touch ~/.pycaosdb.ini
- make unittest - make unittest
unittest_py3.10:
tags: [ docker ]
stage: test
needs: [ ]
image: python:3.10
script: *python_test_script
# Trigger building of server image and integration tests # Trigger building of server image and integration tests
trigger_build: trigger_build:
stage: deploy stage: deploy
...@@ -88,12 +110,12 @@ build-testenv: ...@@ -88,12 +110,12 @@ build-testenv:
stage: setup stage: setup
only: only:
- schedules - schedules
script: script:
- cd unittests/docker - cd unittests/docker
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
# use here general latest or specific branch latest... # use here general latest or specific branch latest...
- docker pull $CI_REGISTRY_IMAGE|| true - docker pull $CI_REGISTRY_IMAGE|| true
- docker build - docker build
--pull --pull
--build-arg COMMIT=$CI_COMMIT_SHORT_SHA --build-arg COMMIT=$CI_COMMIT_SHORT_SHA
--cache-from $CI_REGISTRY_IMAGE --cache-from $CI_REGISTRY_IMAGE
...@@ -105,7 +127,7 @@ build-testenv: ...@@ -105,7 +127,7 @@ build-testenv:
pages_prepare: &pages_prepare pages_prepare: &pages_prepare
tags: [ cached-dind ] tags: [ cached-dind ]
stage: deploy stage: deploy
needs: [ code_style, pylint, unittest ] needs: [ code_style, pylint, unittest_py3.8, unittest_py3.9, unittest_py3.10 ]
only: only:
refs: refs:
- /^release-.*$/i - /^release-.*$/i
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment