From 1d3c2c9c2160e87b4e47d2fff7ab0278589593a2 Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Thu, 10 Nov 2022 16:21:55 +0100
Subject: [PATCH] TST: Add Python 3.10 to unittest pipeline
---
.gitlab-ci.yml | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75148672..cc7eca53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
CI_REGISTRY_IMAGE_BASE: $CI_REGISTRY/caosdb/src/caosdb-advanced-user-tools/base:latest
-stages:
+stages:
- setup
- cert
- style
@@ -53,15 +53,15 @@ test:
- time docker load < /image-cache/mariadb.tar || true
- time docker load < /image-cache/caosdb-dev.tar || true
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - EXEPATH=`pwd` CAOSDB_TAG=$CAOSDB_TAG docker-compose
+ - EXEPATH=`pwd` CAOSDB_TAG=$CAOSDB_TAG docker-compose
-f .docker/docker-compose.yml up -d
- - cd .docker
+ - cd .docker
- /bin/sh ./run.sh
- - cd ..
+ - cd ..
- docker logs docker-caosdb-server-1 &> caosdb_log.txt
- docker logs docker-sqldb-1 &> mariadb_log.txt
- docker-compose -f .docker/docker-compose.yml down
- - rc=`cat .docker/result`
+ - rc=`cat .docker/result`
- exit $rc
dependencies: [cert]
needs: [cert]
@@ -76,19 +76,19 @@ build-testenv:
tags: [cached-dind]
image: docker:18.09
stage: setup
- # Hint: do not use only here; the image needs always to be build since it
+ # Hint: do not use only here; the image needs always to be build since it
# contains the repo code
#only:
- script:
+ script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
# use here general latest or specific branch latest...
- - docker build
+ - docker build
--file .docker/Dockerfile
-t $CI_REGISTRY_IMAGE .
- docker push $CI_REGISTRY_IMAGE
- docker save $CI_REGISTRY_IMAGE > /image-cache/caosdb-advanced-testenv.tar
- cd .docker-base
- - docker build
+ - docker build
-t $CI_REGISTRY_IMAGE_BASE .
- docker push $CI_REGISTRY_IMAGE_BASE
@@ -142,6 +142,12 @@ unittest_py38:
- pip install .
- pytest --cov=caosadvancedtools unittests
+unittests_py39:
+ tags: [docker]
+ stage: unittest
+ image: python:3.10
+ script: *python_test_script
+
# Build the sphinx documentation and make it ready for deployment by Gitlab Pages
# Special job for serving a static website. See https://docs.gitlab.com/ee/ci/yaml/README.html#pages
pages_prepare: &pages_prepare
--
GitLab