MAINT: whitepsace and comments

.gitlab-ci.yml

@@ -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.
@@ -64,8 +53,8 @@ stages:
 
 # run qunit tests
 test:qunit:
+  tags: [ docker ]
     stage: test
-    #tags: [ py36 ]
     artifacts:
         paths:
             - public/qunit.log
@@ -75,7 +64,9 @@ test:qunit:
 # TODO fix the following
 #        - make run-qunit
           
+# Trigger building of server image and integration tests
 trigger_build:
+  tags: [ docker ]
   stage: deploy
   script:
     - echo $TOKEN     
@@ -83,19 +74,16 @@ trigger_build:
        -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:
+  tags: [ docker ]
     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