Commit 68307570 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

Merge branch 'dev' into f-templ_error

parents ad28ecda 44c249b2
......@@ -4,6 +4,7 @@
#
# Copyright (C) 2018 Research Group Biomedical Physics,
# 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
# it under the terms of the GNU Affero General Public License as
......@@ -23,19 +24,7 @@
variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-webui-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/
# With dind the docker deamon is available on the network
DOCKER_HOST: tcp://docker:2375/
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
......@@ -48,58 +37,48 @@ image: $CI_REGISTRY_IMAGE:latest
stages:
- setup
- linting
- test
- deploy
- setup
- linting
- test
- deploy
#######
# setup
#######
### TODO !!! use respective docker image
######
# test
######
# run qunit tests
test:qunit:
stage: test
#tags: [ py36 ]
artifacts:
paths:
- public/qunit.log
- screenlog.*
script:
- make pylint
# TODO fix the following
# - make run-qunit
# run qunit tests and pylint
test:
tags: [ docker ]
stage: test
artifacts:
paths:
- public/qunit.log
- screenlog.*
script:
- make pylint
- make run-qunit
# Trigger building of server image and integration tests
trigger_build:
tags: [ docker ]
stage: deploy
script:
- echo $TOKEN
- /usr/bin/curl -X POST
-F token=$TOKEN
-F "variables[WEBUI]=$CI_COMMIT_REF_NAME"
-F "variables[TriggerdBy]=WEBUI"
-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:
image: docker:latest
stage: setup
script:
- echo $TRIGGERED_BY
- echo $MYSQLBACKEND
- ping -4 -c 3 registry.indiscale.com
- echo $PYLIB
- cd test/docker
- echo $CI_REGISTRY_PASSWORD
- echo $CI_REGISTRY
- 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
--cache-from $CI_REGISTRY_IMAGE:latest
-t $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE:latest
tags: [ docker ]
image: docker:latest
stage: setup
script:
- cd test/docker
- 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
--cache-from $CI_REGISTRY_IMAGE:latest
-t $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE:latest
......@@ -98,7 +98,7 @@ this.connection = new function() {
this.runScript = async function _runScript(scriptname, params) {
var pstring = "call=" + scriptname;
for (var key in params) {
pstring += "&O" + key + "=" + params[key];
pstring += "&-O" + key + "=" + params[key];
}
try {
return await $.ajax({
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment