From df821f35eeac446bdf0354af2b3e278409d9285b Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Wed, 30 Sep 2015 15:57:02 -0400 Subject: [PATCH] Add node_modules to the path via the jenkins-common script instead of all-tests. The jenkins-common script is the better place for this particular setup, since that script is doing similar setup steps to prepare the environment for running various tests/subsequent scripts. This also will resolve downstream processes, such as our jenkins AMI builder (for jenkins-worker images). --- scripts/generic-ci-tests.sh | 1 - scripts/jenkins-common.sh | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh index bf71d64aa8..125e1e4b50 100755 --- a/scripts/generic-ci-tests.sh +++ b/scripts/generic-ci-tests.sh @@ -70,7 +70,6 @@ case "$TEST_SUITE" in mkdir -p reports echo "Finding jshint violations and storing report..." - PATH=$PATH:node_modules/.bin paver run_jshint -l $JSHINT_THRESHOLD > jshint.log || { cat jshint.log; EXIT=1; } echo "Running code complexity report (python)." paver run_complexity > reports/code_complexity.log || echo "Unable to calculate code complexity. Ignoring error." diff --git a/scripts/jenkins-common.sh b/scripts/jenkins-common.sh index 2ad9899164..fb52f5a1c5 100644 --- a/scripts/jenkins-common.sh +++ b/scripts/jenkins-common.sh @@ -34,3 +34,6 @@ fi # Activate the Python virtualenv source $HOME/edx-venv/bin/activate + +# add the node_js packages dir to PATH +PATH=$PATH:node_modules/.bin