From 3681a4b77f29a9bbb6cbbd6841fc0a9c8a41106e Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 18 Jan 2018 10:34:04 -0500 Subject: [PATCH 1/2] Move the client build for selenium to run_tests.sh instead of in the external jenkins job configuration. Has the added benefit of skipping the client build when we don't want to run it. --- .ci/jenkins/selenium/run_tests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/jenkins/selenium/run_tests.sh b/.ci/jenkins/selenium/run_tests.sh index a516fc6aeda..6b49ce294af 100644 --- a/.ci/jenkins/selenium/run_tests.sh +++ b/.ci/jenkins/selenium/run_tests.sh @@ -16,6 +16,8 @@ fi mkdir -p "$GALAXY_TEST_ERRORS_DIRECTORY" mkdir -p "$GALAXY_TEST_SCREENSHOTS_DIRECTORY" +docker run -v `pwd`:`pwd`:rw -w `pwd` -u $UID node /bin/bash -c 'make client-production' + # Start Selenium server in the test Docker container. DOCKER_RUN_EXTRA_ARGS="-e USE_SELENIUM=1 -e GALAXY_TEST_SELENIUM_RETRIES=${GALAXY_TEST_SELENIUM_RETRIES} -e GALAXY_TEST_ERRORS_DIRECTORY=${GALAXY_TEST_ERRORS_DIRECTORY} -e GALAXY_TEST_SCREENSHOTS_DIRECTORY=${GALAXY_TEST_SCREENSHOTS_DIRECTORY} ${DOCKER_RUN_EXTRA_ARGS}" export DOCKER_RUN_EXTRA_ARGS From e61d5cdadfdd17b8879b6ec9a74937cb3eac3479 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 18 Jan 2018 11:26:59 -0500 Subject: [PATCH 2/2] Build sourcemaps for the jenkins selenium tests -- I don't know that this actually gets resolved, but it doesn't have a huge impact on build time anyway --- .ci/jenkins/selenium/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/jenkins/selenium/run_tests.sh b/.ci/jenkins/selenium/run_tests.sh index 6b49ce294af..18cecbe5c11 100644 --- a/.ci/jenkins/selenium/run_tests.sh +++ b/.ci/jenkins/selenium/run_tests.sh @@ -16,7 +16,7 @@ fi mkdir -p "$GALAXY_TEST_ERRORS_DIRECTORY" mkdir -p "$GALAXY_TEST_SCREENSHOTS_DIRECTORY" -docker run -v `pwd`:`pwd`:rw -w `pwd` -u $UID node /bin/bash -c 'make client-production' +docker run -v `pwd`:`pwd`:rw -w `pwd` -u $UID node /bin/bash -c 'make client-production-maps' # Start Selenium server in the test Docker container. DOCKER_RUN_EXTRA_ARGS="-e USE_SELENIUM=1 -e GALAXY_TEST_SELENIUM_RETRIES=${GALAXY_TEST_SELENIUM_RETRIES} -e GALAXY_TEST_ERRORS_DIRECTORY=${GALAXY_TEST_ERRORS_DIRECTORY} -e GALAXY_TEST_SCREENSHOTS_DIRECTORY=${GALAXY_TEST_SCREENSHOTS_DIRECTORY} ${DOCKER_RUN_EXTRA_ARGS}"