From a7ee27614a9253bd61d58090781f555a22010b86 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 24 Jan 2018 15:56:38 -0500 Subject: [PATCH] Force a new node version when building client for Jenkins. At least one of our Jenkins nodes - possibly more - is failing to build the client without failing the test outright. --- .ci/jenkins/selenium/run_tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/jenkins/selenium/run_tests.sh b/.ci/jenkins/selenium/run_tests.sh index 18cecbe5c117..00d1d0e1a952 100644 --- a/.ci/jenkins/selenium/run_tests.sh +++ b/.ci/jenkins/selenium/run_tests.sh @@ -2,6 +2,7 @@ # Enable retries on tests to reduce chances of transient failures. : ${GALAXY_TEST_SELENIUM_RETRIES:=1} +: ${GALAXY_TEST_CLIENT_BUILD_IMAGE:='node:9.4.0'} # If in Jenkins environment, use it for artifacts. if [ -n "$BUILD_NUMBER" ]; @@ -16,7 +17,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-maps' +docker run -v `pwd`:`pwd`:rw -w `pwd` -u $UID $GALAXY_TEST_CLIENT_BUILD_IMAGE /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}"