Merge branch 'dev' of gitlab.com:caosdb/caosdb-pyinttest into dev

.docker/Dockerfile

@@ -7,4 +7,4 @@ RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \
 COPY . /git
 RUN rm -r /git/.git && mv /git/.docker/pycaosdb.ini /git 
 WORKDIR /git
-CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox
+CMD /wait-for-it.sh caosdb-server:10443 -t 300 -- tox

.gitlab-ci.yml

@@ -73,7 +73,7 @@ test:
     entrypoint: ["/bin/sh", "-c"]
   script:
       - if [[ "$CAOSDB_TAG" == "" ]]; then
-            CAOSDB_TAG=master-latest;
+            CAOSDB_TAG=dev-latest;
         fi
       - echo $CAOSDB_TAG
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY