From d79d6b96816759bde4234523bbd7a2384474f420 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sun, 4 Dec 2016 22:58:47 -0500
Subject: [PATCH 1/3] Improved logging for selenium docker-compose problems.

If containers fail to start, (as the Galaxy container for the selenium test appears to fail currently) print docker logs for that container.
---
 .ci/jenkins/selenium/run_galaxy.bash |  4 ++++
 .ci/jenkins/selenium/run_tests.sh    | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/selenium/run_galaxy.bash b/.ci/jenkins/selenium/run_galaxy.bash
index 250dc422c3d..295e39a825e 100755
--- a/.ci/jenkins/selenium/run_galaxy.bash
+++ b/.ci/jenkins/selenium/run_galaxy.bash
@@ -6,7 +6,11 @@ sleep 10  # 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"
diff --git a/.ci/jenkins/selenium/run_tests.sh b/.ci/jenkins/selenium/run_tests.sh
index 1dc7bb6c930..b14ef17d261 100755
--- a/.ci/jenkins/selenium/run_tests.sh
+++ b/.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
@@ -70,6 +70,12 @@ do
         if ! docker ps | grep -q "${COMPOSE_PROJECT_NAME}_${service_name}"
         then
             echo "Service ${service_name} stopped, exiting and halting containers."
+            container_id_var="${service_name}_container_id"
+            container_id="${!container_id_var}"
+            echo "Failing container (${container_id}) logs..."
+            echo "---"
+            docker logs "${container_id}"
+            echo "---"
             docker-compose down | true
             exit 1
         fi

From 5fb334aaee5bff40b51bdca955bb06e21e2a07d8 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sun, 4 Dec 2016 23:10:01 -0500
Subject: [PATCH 2/3] Increase timeout based on logging on
 docker.galaxyproject.org.

---
 .ci/jenkins/selenium/run_galaxy.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/selenium/run_galaxy.bash b/.ci/jenkins/selenium/run_galaxy.bash
index 295e39a825e..d9016fe9117 100755
--- a/.ci/jenkins/selenium/run_galaxy.bash
+++ b/.ci/jenkins/selenium/run_galaxy.bash
@@ -2,7 +2,7 @@
 
 set -e
 
-sleep 10  # TODO: wait on something instead of just sleeping...
+sleep 30  # TODO: wait on something instead of just sleeping...
 
 echo `df`
 

From 851f66f3e8996c34ed306c09de7f1e8b661e25ea Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 5 Dec 2016 08:39:34 -0500
Subject: [PATCH 3/3] Actually dump all logs on failure...

---
 .ci/jenkins/selenium/run_tests.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.ci/jenkins/selenium/run_tests.sh b/.ci/jenkins/selenium/run_tests.sh
index b14ef17d261..de312f3a080 100755
--- a/.ci/jenkins/selenium/run_tests.sh
+++ b/.ci/jenkins/selenium/run_tests.sh
@@ -69,13 +69,16 @@ do
     do
         if ! docker ps | grep -q "${COMPOSE_PROJECT_NAME}_${service_name}"
         then
-            echo "Service ${service_name} stopped, exiting and halting containers."
-            container_id_var="${service_name}_container_id"
-            container_id="${!container_id_var}"
-            echo "Failing container (${container_id}) logs..."
-            echo "---"
-            docker logs "${container_id}"
-            echo "---"
+            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