Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-advanced-user-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-advanced-user-tools
Commits
f9fa6e57
Commit
f9fa6e57
authored
2 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Plain Diff
Merge branch 'f-python-versions-pipeline' into 'dev'
F python versions pipeline See merge request
!60
parents
d50d2fdb
5b323f98
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!65
DOC: Added CITATION.cff to the list of files in the release guide where the...
,
!60
F python versions pipeline
Pipeline
#30484
passed
2 years ago
Stage: setup
Stage: cert
Stage: style
Stage: unittest
Stage: integrationtest
Changes
2
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+30
-12
30 additions, 12 deletions
.gitlab-ci.yml
tox.ini
+1
-1
1 addition, 1 deletion
tox.ini
with
31 additions
and
13 deletions
.gitlab-ci.yml
+
30
−
12
View file @
f9fa6e57
...
...
@@ -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
...
...
@@ -123,14 +123,32 @@ linting:
-
make lint
allow_failure
:
true
unittest
:
unittest
_py39
:
tags
:
[
docker
]
stage
:
unittest
image
:
$CI_REGISTRY_IMAGE
needs
:
[
build-testenv
]
script
:
-
python3 -c "import caosdb; print('CaosDB Version:', caosdb.__version__)"
-
tox
# First verify that system Python actually is 3.9
-
python3 -c "import sys; assert sys.version.startswith('3.9')"
-
python3 -c "import caosdb; print('CaosDB Version:', caosdb.__version__)"
-
tox
unittest_py38
:
tags
:
[
docker
]
stage
:
unittest
image
:
python:3.8
script
:
&python_test_script
-
pip install nose pandas pytest pytest-cov gitignore-parser openpyxl>=3.0.7 xlrd==1.2 h5py
-
pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
-
pip install .
-
pytest --cov=caosadvancedtools unittests
unittest_py310
:
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
...
...
This diff is collapsed.
Click to expand it.
tox.ini
+
1
−
1
View file @
f9fa6e57
[tox]
envlist
=
py36, py37,
py38, py39, py310
envlist
=
py38, py39, py310
skip_missing_interpreters
=
true
[testenv]
deps
=
nose
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment