Merge pull request #3264 from jmchilton/improved_selenium_logging

Improved logging for selenium docker-compose problems.

.ci/jenkins/selenium/run_galaxy.bash

@@ -2,11 +2,15 @@
 
 set -e
 
-sleep 10  # TODO: wait on something instead of just sleeping...
+sleep 30  # TODO: wait on something instead of just sleeping...
 
 echo `df`
 
+echo "Creating postgres database for Galaxy"
 createdb -w -U postgres -h postgres galaxy
+
+echo "Starting and waiting for Galaxy daemon(s)"
 GALAXY_RUN_ALL=1 bash "$GALAXY_ROOT/run.sh" --daemon --wait
 
+echo "Galaxy daemon ready, monitoring Galaxy logs"
 tail -f "$GALAXY_ROOT/main.log"

.ci/jenkins/selenium/run_tests.sh

@@ -43,7 +43,9 @@ do
     do
         if docker ps | grep -q "${COMPOSE_PROJECT_NAME}_${service_name}"
         then
-            echo "Service ${service_name} ready."
+            container_id=`docker ps | grep "${COMPOSE_PROJECT_NAME}_${service_name}" | cut -d " " -f 1`
+            eval "${service_name}_container_id=${container_id}"
+            echo "Service ${service_name} ready - with container ID ${container_id}"
             break
         fi
         printf "."
@@ -51,8 +53,6 @@ do
     done
 done
 
-docker ps | grep -q 'prickly_x'
-
 
 if [ "$1" = "--debug-running-containers" ];
 then
@@ -69,7 +69,16 @@ do
     do
         if ! docker ps | grep -q "${COMPOSE_PROJECT_NAME}_${service_name}"
         then
-            echo "Service ${service_name} stopped, exiting and halting containers."
+            echo "Service ${service_name} stopped before Galaxy came up, exiting and halting containers."
+            for service_name in postgres galaxy selenium
+            do
+                container_id_var="${service_name}_container_id"
+                container_id="${!container_id_var}"
+                echo "Dumping logs for $service_name container (${container_id})..."
+                echo "---"
+                docker logs "${container_id}"
+                echo "---"
+            done
             docker-compose down | true
             exit 1
         fi