log services on failure

testing/gitlab_test.sh

 #!/bin/sh
 
+function log_services () {
+  if [ $? -ne 0 ]
+  then
+    echo "Failure in tests, logging from services:"
+    for service in $(docker service ls --format "{{.Name}}"); do
+      docker service ps $service --no-trunc >> "/tmp/$service.log"
+      docker service logs $service >> "/tmp/$service.log"
+      docker service ps $service --no-trunc
+      docker service logs $service
+    done
+    exit 1
+  fi
+}
 # fetch secrets and write them to their according files
 cat $vhr18_db > ../env/vhr18_db.env
 cat $vhr18_django > ../env/vhr18_django.env
@@ -49,7 +62,7 @@ bash ./registrar_prep.sh product_list.csv
 
 pytest registrar_test.py preprocessor_test.py renderer_test.py
 
-if [ $? -ne 0 ]; then echo "Pytest fail" >&2 && exit 1; fi
+log_services
 
 swift delete preprocessor_results
 
@@ -62,17 +75,7 @@ sleep 90
 # test the existance of ingested item
 pytest ingestor_test.py
 
-swift delete preprocessor_results
+log_services
 
-if [ $? -ne 0 ]
-then
-  echo "Failure in tests, logging from services:"
-  for service in $(docker service ls --format "{{.Name}}"); do
-    docker service ps $service --no-trunc >> "/tmp/$service.log"
-    docker service logs $service >> "/tmp/$service.log"
-    docker service ps $service --no-trunc
-    docker service logs $service
-  done
-  exit 1
-fi
 
+swift delete preprocessor_results
\ No newline at end of file