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

fix return value

parent 99ddd623
Branches
Tags
No related merge requests found
...@@ -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 300 -- tox CMD .docker/run.sh
#!/bin/bash
tox
echo $?>test_success
#!/bin/bash
/wait-for-it.sh caosdb-server:10443 -t 300 -- .docker/run-test.sh
cat test_success
rv=`cat test_success`
echo $rv
exit $rv
...@@ -82,14 +82,11 @@ test: ...@@ -82,14 +82,11 @@ test:
- DIR=`pwd` - DIR=`pwd`
- CERTPATH=$DIR"/cert" CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d - CERTPATH=$DIR"/cert" CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
# prevent this script from terminating when the return value is non-zero # prevent this script from terminating when the return value is non-zero
- set +e
- docker-compose -f tester.yml run tester - docker-compose -f tester.yml run tester
- rc=$?
- echo $rc
- set -e
- docker logs docker_caosdb-server_1 &> ../caosdb_log.txt - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
- docker logs docker_sqldb_1 &> ../mariadb_log.txt - docker logs docker_sqldb_1 &> ../mariadb_log.txt
- docker-compose down - docker-compose down
- rc=`cat /git/test_success`
- exit $rc - exit $rc
artifacts: artifacts:
paths: paths:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment