5824: Merge branch 'master' into 5824-keep-web-workbench

diff --git a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
index edecb211b79dcac25cda058f81fecba0bc30cc18..2fff1e7cf9e4f507436c6717a6b3e83ececa7820 100755 (executable)
--- a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
+++ b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
@@ -81,7 +81,10 @@ chown -R "$WWW_OWNER" $RELEASE_PATH/tmp
 chown -R "$WWW_OWNER" $SHARED_PATH/log
 chown "$WWW_OWNER" $RELEASE_PATH/db/structure.sql
 chmod 644 $SHARED_PATH/log/*
-chmod -R 2775 $RELEASE_PATH/tmp/cache/
+# Rails creates the cache directory if it doesn't exist
+if [[ -d $RELEASE_PATH/tmp/cache/ ]]; then
+  chmod -R 2775 $RELEASE_PATH/tmp/cache/
+fi
 echo "Done."
 
 echo "Running sanity check"

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 1b1e757a288f060b9deb6d4afca45bdcd94aeb19..d9a4a9c0cf9fa30216490cc830f39d3736e641e9 100755 (executable)
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -151,7 +151,7 @@ sanity_checks() {
     echo Checking dependencies:
     echo -n 'virtualenv: '
     virtualenv --version \
-        || fatal "No virtualenv. Try: apt-get install virtualenv"
+        || fatal "No virtualenv. Try: apt-get install virtualenv (on ubuntu: python-virtualenv)"
     echo -n 'go: '
     go version \
         || fatal "No go binary. See http://golang.org/doc/install"
@@ -173,7 +173,7 @@ sanity_checks() {
     for mod in ExtUtils::MakeMaker JSON LWP Net::SSL; do
         echo -n "perl $mod: "
         perl -e "use $mod; print \"\$$mod::VERSION\\n\"" \
-            || fatal "No $mod. Try: apt-get install perl-modules libcrypt-ssleay-perl libjson-perl"
+            || fatal "No $mod. Try: apt-get install perl-modules libcrypt-ssleay-perl libjson-perl libwww-perl"
     done
     echo -n 'gitolite: '
     which gitolite \
@@ -394,6 +394,8 @@ setup_virtualenv() {
         virtualenv --setuptools "$@" "$venvdest" || fatal "virtualenv $venvdest failed"
     fi
     "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7'
+    # ubuntu1404 can't seem to install mock via tests_require, but it can do this.
+    "$venvdest/bin/pip" install 'mock>=1.0'
 }
 
 export PERLINSTALLBASE