Do not blow up when another puppet process is already running during deploy.

[arvados-dev.git] / jenkins / run-tests.sh

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 05f009ca339d46a2b21305f577df38157194ab30..40a6daa0363c2643622114e769122ab7a61a4700 100755 (executable)
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -21,7 +21,7 @@ Options:
 WORKSPACE=path Arvados source tree to test.
 CONFIGSRC=path Dir with api server config files to copy into source tree.
                (If none given, leave config files alone in source tree.)
-apiserver_test="TEST=test/functional/arvados/v1/collections_test.rb"
+apiserver_test="TEST=test/functional/arvados/v1/collections_controller_test.rb"
                Restrict apiserver tests to the given file
 python_sdk_test="--test-suite test.test_keep_locator"
                Restrict Python SDK tests to the given class
@@ -122,12 +122,6 @@ declare -A skip
 # Always skip CLI tests. They don't know how to use run_test_server.py.
 skip[cli]=1
 
-# Skip Node Manager tests.  Because these tests are multithreaded, their
-# performance is a little unpredictable, and Jenkins regularly has trouble
-# with them.  Brett has a plan for making them more robust, but it's going
-# to take a little time to implement.  -2014-10-10
-skip[nodemanager]=1
-
 while [[ -n "$1" ]]
 do
     arg="$1"; shift
@@ -153,7 +147,7 @@ do
             leave_temp[GEMHOME]=1
             ;;
         *=*)
-            eval $(echo $arg | cut -d= -f1)=\"$(echo $arg | cut -d= -f2-)\"
+            eval export $(echo $arg | cut -d= -f1)=\"$(echo $arg | cut -d= -f2-)\"
             ;;
         *)
             echo >&2 "$0: Unrecognized option: '$arg'. Try: $0 --help"
@@ -171,6 +165,10 @@ if [[ -z "$CONFIGSRC" ]] && [[ -d "$HOME/arvados-api-server" ]]; then
     CONFIGSRC="$HOME/arvados-api-server"
 fi
 
+# Clean up .pyc files that may exist in the workspace
+cd "$WORKSPACE"
+find -name '*.pyc' -delete
+
 # Set up temporary install dirs (unless existing dirs were supplied)
 for tmpdir in VENVDIR GOPATH GEMHOME
 do
@@ -343,6 +341,7 @@ do_install apiserver
 
 declare -a gostuff
 gostuff=(
+    services/crunchstat
     services/keepstore
     services/keepproxy
     sdk/go/arvadosclient