From 653dfaf6be6378f846aa65dcb3f1b57055816e07 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 19 Oct 2015 16:07:43 -0400 Subject: [PATCH 1/2] testing-base docker image changes: 1. Always run common_startup.sh 2. Install packages in dev-requirements.txt if they exist. --- test/docker/base/run_test_wrapper.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/docker/base/run_test_wrapper.sh b/test/docker/base/run_test_wrapper.sh index 191a3c0c325..9759cf34c4f 100644 --- a/test/docker/base/run_test_wrapper.sh +++ b/test/docker/base/run_test_wrapper.sh @@ -24,7 +24,10 @@ cd /galaxy GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION="$GALAXY_TEST_DBURI"; export GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION -[ ! -d .venv ] && ./scripts/common_startup.sh +./scripts/common_startup.sh + +dev_requirements=./lib/galaxy/dependencies/dev-requirements.txt +[ -f $dev_requirements ] && ./.venv/bin/pip install -r $dev_requirements sh manage_db.sh upgrade From f2878d22dda913d8ed289c4c2d65cbcaee890691 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Tue, 20 Oct 2015 09:42:42 -0400 Subject: [PATCH 2/2] Docker testing-base: fail if common_startup.sh fails --- test/docker/base/run_test_wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/docker/base/run_test_wrapper.sh b/test/docker/base/run_test_wrapper.sh index 9759cf34c4f..0fc6536b596 100644 --- a/test/docker/base/run_test_wrapper.sh +++ b/test/docker/base/run_test_wrapper.sh @@ -24,7 +24,7 @@ cd /galaxy GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION="$GALAXY_TEST_DBURI"; export GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION -./scripts/common_startup.sh +./scripts/common_startup.sh || { echo "common_startup.sh failed"; exit 1; } dev_requirements=./lib/galaxy/dependencies/dev-requirements.txt [ -f $dev_requirements ] && ./.venv/bin/pip install -r $dev_requirements