make integration tests a little bit nicer

Author: rvankoert

test_htr_api.sh

@@ -44,10 +44,10 @@ export LOGHI_GPUS="-1"
 # Start the API server in docker
 container_id=$(docker run -u $(id -u ${USER}):$(id -g ${USER}) -v $LOGHI_MODEL_PATH:$LOGHI_MODEL_PATH -v $TEMP_OUTPUT_DIR:$TEMP_OUTPUT_DIR -e LOGHI_MODEL_PATH=$LOGHI_MODEL_PATH -e LOGHI_CHARLIST_PATH="$LOGHI_MODEL_PATH/charlist.txt" -e LOGHI_MODEL_CHANNELS=1 -e LOGHI_BATCH_SIZE=300 -e LOGHI_OUTPUT_PATH="$TEMP_OUTPUT_DIR" -e LOGHI_MAX_QUEUE_SIZE=50000 -e LOGGING_LEVEL="DEBUG" -e LOGHI_GPUS="-1" -e GUNICORN_RUN_HOST='0.0.0.0:5000' -e GUNICORN_WORKERS=1 -e GUNICORN_THREADS=1 -e GUNICORN_ACCESSLOG='-' --name htr-api-test -p 5000:5000 -d loghi/docker.htr python3 /src/loghi-htr/src/api/gunicorn_app.py)
 
-
+echo "containerid: "$container_id
 # Assuming the server takes a few seconds to start up, we sleep for a while
 while [ $(curl -w "%{http_code}" -s -o /dev/null localhost:5000/) == "000" ]; do
-  echo echo waiting for webservice to start
+  echo waiting for webservice to start
   sleep 5s
 done
 

tooling_integration_tests.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 #mkdir -p /tmp/upload
+set -e
 tmp_dir=$(mktemp -d)
 container_id=$(docker run -u $(id -u ${USER}):$(id -g ${USER}) -v $tmp_dir:/tmp/upload --name tooling_integrationtest -d -p 8080:8080 -p 8081:8081 loghi/docker.loghi-tooling /src/loghi-tooling/loghiwebservice/target/appassembler/bin/LoghiWebserviceApplication server /src/loghi-tooling/loghiwebservice/target/classes/configuration.yml)
+echo $container_id
 
 while [ "$( docker container inspect -f '{{.State.Status}}' tooling_integrationtest )" != "running" ]; do
 	echo waiting for the docker to start