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

MAINT: remove the no-tls from pipeline

parent b16d7555
No related branches found
No related tags found
No related merge requests found
#
# ** header v3.0
# This file is a part of the CaosDB Project.
#
# Copyright (C) 2018 Research Group Biomedical Physics,
......@@ -18,47 +17,15 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
# ** end header
#
#before_script:
# - apt-get update -qq && apt-get install -y -qq sqlite3 libsqlite3-dev nodejs
# - ruby -v
# - which ruby
# - gem install bundler --no-document
# - bundle install --jobs $(nproc) "${FLAGS[@]}"
#
#rspec:
# script:
# - bundle exec rspec
#
#rubocop:
# script:
# - bundle exec rubocop
#
variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pyint-testenv
# When using dind service we need to instruct docker, to talk with the
# daemon started inside of the service. The daemon is available with
# a network connection instead of the default /var/run/docker.sock socket.
#
# The 'docker' hostname is the alias of the service container as described at
# 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:
- docker:18.09.7-dind
- docker:19.03.0-dind
stages:
- setup
......@@ -113,17 +80,15 @@ stages:
# file-system features.
#
test:
tags: [notls]
tags: [docker]
stage: test
image:
name: docker/compose:1.24.1
entrypoint: ["/bin/sh", "-c"]
image: registry.indiscale.com/caosdb-run-base
script:
- if [[ "$CAOSDB_TAG" == "" ]]; then
CAOSDB_TAG=dev-latest;
fi
- echo $CAOSDB_TAG
- KNOWN_TAGS=$(curl -u testuser:$CI_REGISTRY_PASSWORD -X GET https://$CI_REGISTRY:5000/v2/caosdb/tags/list)
- KNOWN_TAGS=$(curl -u testuser:$CI_REGISTRY_PASSWORD -X GET https://$CI_REGISTRY/v2/caosdb/tags/list)
- echo $KNOWN_TAGS
# test if the caosdb registry knows our current tag
- echo $KNOWN_TAGS | grep "$CAOSDB_TAG"
......@@ -135,10 +100,11 @@ test:
# the pyinttest docker writes the return value of the tests into the
# file result
- /bin/sh ./run.sh
- cd ..
- docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
- docker logs docker_sqldb_1 &> ../mariadb_log.txt
- docker-compose down
- rc=`cat result`
- docker-compose -f .docker/docker-compose.yml down
- rc=`cat .docker/result`
- exit $rc
dependencies: [cert]
artifacts:
......@@ -152,20 +118,19 @@ build-testenv:
tags: [notls]
image: docker:18.09
stage: setup
only:
- schedules
script:
- df -h
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# use here general latest or specific branch latest...
- docker pull $CI_REGISTRY_IMAGE:latest || true
- docker build
--pull
--file .docker/Dockerfile
--cache-from $CI_REGISTRY_IMAGE:latest
-t $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE:latest
cert:
tags: [notls]
tags: [docker]
stage: cert
image: $CI_REGISTRY_IMAGE:latest
artifacts:
......
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