Skip to content
Snippets Groups Projects
Verified Commit 99ddd623 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

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

parents 9bb1ac20 264745fc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.docker/Dockerfile
+ 1
− 1
View file @ 99ddd623
...@@ -7,4 +7,4 @@ RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \ ...@@ -7,4 +7,4 @@ RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \
COPY . /git COPY . /git
RUN rm -r /git/.git && mv /git/.docker/pycaosdb.ini /git RUN rm -r /git/.git && mv /git/.docker/pycaosdb.ini /git
WORKDIR /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
+ 1
− 1
View file @ 99ddd623
...@@ -73,7 +73,7 @@ test: ...@@ -73,7 +73,7 @@ test:
entrypoint: ["/bin/sh", "-c"] entrypoint: ["/bin/sh", "-c"]
script: script:
- if [[ "$CAOSDB_TAG" == "" ]]; then - if [[ "$CAOSDB_TAG" == "" ]]; then
CAOSDB_TAG=master-latest; CAOSDB_TAG=dev-latest;
fi fi
- echo $CAOSDB_TAG - echo $CAOSDB_TAG
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment