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

MAINT: whitepsace and comments

parent af70b2e3
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
# #
# Copyright (C) 2018 Research Group Biomedical Physics, # Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen # Max-Planck-Institute for Dynamics and Self-Organization Göttingen
# Copyright (C) 2019 Henrik tom Wörden
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
...@@ -22,71 +23,68 @@ ...@@ -22,71 +23,68 @@
# #
variables: variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pylib-testenv CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pylib-testenv
# When using dind service we need to instruct docker, to talk with the # With dind the docker deamon is available on the network
# daemon started inside of the service. The daemon is available with DOCKER_HOST: tcp://docker:2375/
# a network connection instead of the default /var/run/docker.sock socket. # When using dind, it's wise to use the overlayfs driver for
# # improved performance.
# The 'docker' hostname is the alias of the service container as described at DOCKER_DRIVER: overlay2
# https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services
#
# Note that if you're using the Kubernetes executor, the variable should be set to
# tcp://localhost:2375/ because of how the Kubernetes executor connects services
# to the job container
# DOCKER_HOST: tcp://localhost:2375/
#
# For non-Kubernetes executors, we use tcp://docker:2375/
DOCKER_HOST: tcp://docker:2375/
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
DOCKER_DRIVER: overlay2
services: services:
- docker:dind - docker:dind
image: $CI_REGISTRY_IMAGE:latest image: $CI_REGISTRY_IMAGE:latest
stages: stages:
- code_style - code_style
- setup - setup
- test - test
- deploy - deploy
# check code style
code_style: code_style:
stage: code_style tags: [ docker ]
script: stage: code_style
- pycodestyle --count ./ script:
- pylint3 --unsafe-load-any-extension=y -d all -e E,F src/caosdb/common - pycodestyle --count ./
allow_failure: true - pylint3 --unsafe-load-any-extension=y -d all -e E,F src/caosdb/common
allow_failure: true
# pylint tests for pycaosdb # pylint tests for pycaosdb
test: test:
stage: test tags: [ docker ]
script: stage: test
- touch ~/.pycaosdb.ini script:
- tox -r - touch ~/.pycaosdb.ini
- tox -r
# Trigger building of server image and integration tests
trigger_build: trigger_build:
tags: [ docker ]
stage: deploy stage: deploy
script: script:
- echo $TOKEN - echo $TOKEN
- /usr/bin/curl -X POST - /usr/bin/curl -X POST
-F token=$TOKEN -F token=$TOKEN
-F "variables[PYLIB]=$CI_COMMIT_REF_NAME" -F "variables[PYLIB]=$CI_COMMIT_REF_NAME"
-F "variables[TriggerdBy]=PYLIB" -F "variables[TriggerdBy]=PYLIB"
-F ref=master https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
-F ref=master https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline
# Build a docker image in which tests for this repository can run
build-testenv: build-testenv:
image: docker:latest tags: [ docker ]
stage: setup image: docker:latest
script: stage: setup
- cd unittests/docker script:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - cd unittests/docker
# use here general latest or specific branch latest... - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker pull $CI_REGISTRY_IMAGE:latest || true # use here general latest or specific branch latest...
- docker build - docker pull $CI_REGISTRY_IMAGE:latest || true
--pull - docker build
--build-arg COMMIT=$CI_COMMIT_SHORT_SHA --pull
--cache-from $CI_REGISTRY_IMAGE:latest --build-arg COMMIT=$CI_COMMIT_SHORT_SHA
-t $CI_REGISTRY_IMAGE:latest . --cache-from $CI_REGISTRY_IMAGE:latest
- docker push $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE:latest
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment