[ARVADOS-DEV] created: 0a4718105bddddc80089d3426aa3a3ff35e66555

[git at public.curoverse.com]

        at  0a4718105bddddc80089d3426aa3a3ff35e66555 (commit)


commit 0a4718105bddddc80089d3426aa3a3ff35e66555
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Jan 11 20:11:58 2015 -0500

    docutils is needed by nodemanager and fuse install recipes.
    
    Fixes "ImportError: No module named docutils.core" during test suite.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 9c86615..68222c1 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -325,7 +325,10 @@ then
 fi
 
 # Needed for run_test_server.py which is used by certain (non-Python) tests.
-pip install PyYAML
+pip install PyYAML || fatal "pip install PyYAML failed"
+
+# Needed for nodemanager and fuse.
+pip install docutils || fatal "pip install docutils failed"
 
 checkexit() {
     if [[ "$?" != "0" ]]; then

commit 82295301ecb7223887e4860ded71ee6373d3bb94
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Jan 11 20:09:36 2015 -0500

    3021: Allow '--only X' to override '--skip X'.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index e561816..9c86615 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -187,7 +187,7 @@ do
             skip[$skipwhat]=1
             ;;
         --only)
-            only="$1"; shift
+            only="$1"; skip[$1]=""; shift
             ;;
         --skip-install)
             skip_install=1

commit 04a389ca22184133efe626dc83d8e8951c802551
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Jan 11 20:08:46 2015 -0500

    3021: Add workbench_profile target. Rename _performance to _benchmark.
    
    These names match the rake tasks, test:benchmark and test:profile.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 14a0a69..e561816 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -47,7 +47,8 @@ https://arvados.org/projects/arvados/wiki/Running_tests
 Available tests:
 
 apps/workbench
-apps/workbench_performance
+apps/workbench_benchmark
+apps/workbench_profile
 doc
 services/api
 services/crunchstat
@@ -170,6 +171,7 @@ sanity_checks() {
 declare -a failures
 declare -A skip
 declare -A testargs
+skip[apps/workbench_profile]=1
 
 while [[ -n "$1" ]]
 do
@@ -562,11 +564,17 @@ test_workbench() {
 }
 do_test apps/workbench workbench
 
-test_workbench_performance() {
+test_workbench_benchmark() {
     cd "$WORKSPACE/apps/workbench" \
-        && RAILS_ENV=test bundle exec rake test:benchmark
+        && RAILS_ENV=test bundle exec rake test:benchmark ${testargs[apps/workbench_benchmark]}
 }
-do_test apps/workbench_performance workbench_performance
+do_test apps/workbench_benchmark workbench_benchmark
+
+test_workbench_profile() {
+    cd "$WORKSPACE/apps/workbench" \
+        && RAILS_ENV=test bundle exec rake test:profile ${testargs[apps/workbench_profile]}
+}
+do_test apps/workbench_profile workbench_profile
 
 report_outcomes
 clear_temp

commit 5fb964860b2cacdf87a18b5295cd0c492aace3f6
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Jan 11 20:04:02 2015 -0500

    3021: Load test fixtures during api install.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index b044ab9..14a0a69 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -489,8 +489,8 @@ install_apiserver() {
 
     cd "$WORKSPACE/services/api" \
         && RAILS_ENV=test bundle exec rake db:drop \
-        && RAILS_ENV=test bundle exec rake db:create \
-        && RAILS_ENV=test bundle exec rake db:setup
+        && RAILS_ENV=test bundle exec rake db:setup \
+        && RAILS_ENV=test bundle exec rake db:fixtures:load
 }
 do_install services/api apiserver
 

-----------------------------------------------------------------------


hooks/post-receive
--