[ARVADOS] updated: 2f9091d71a40dfad185232f3400a79377f5f305b
Git user
git at public.curoverse.com
Thu Aug 17 15:01:09 EDT 2017
Summary of changes:
.gitignore | 1 +
.../app/controllers/collections_controller.rb | 123 +++------------------
apps/workbench/app/views/jobs/_show_log.html.erb | 2 +-
apps/workbench/config/application.default.yml | 7 +-
apps/workbench/config/application.yml.example | 8 ++
apps/workbench/config/load_config.rb | 14 ++-
.../controllers/collections_controller_test.rb | 100 ++++-------------
.../test/integration/anonymous_access_test.rb | 10 +-
.../workbench/test/integration/collections_test.rb | 28 +++--
apps/workbench/test/integration/jobs_test.rb | 40 +++----
apps/workbench/test/integration_helper.rb | 17 ++-
build/build.list | 2 +-
build/run-build-docker-images.sh | 4 +
build/run-build-packages.sh | 1 +
build/run-tests.sh | 11 +-
sdk/cli/bin/crunch-job | 40 +++----
sdk/cwl/arvados_cwl/arvcontainer.py | 3 +
sdk/cwl/arvados_cwl/arvtool.py | 2 +-
sdk/cwl/setup.py | 2 +-
sdk/cwl/tests/test_submit.py | 25 +++++
sdk/cwl/tests/wf/scatter2_subwf.cwl | 1 +
sdk/go/arvados/container.go | 2 +-
sdk/go/arvados/error.go | 2 +-
sdk/go/health/handler.go | 2 +-
sdk/perl/lib/Arvados/Request.pm | 5 +-
sdk/python/arvados/commands/put.py | 1 +
sdk/python/tests/test_arv_put.py | 56 +++++++++-
.../api/app/controllers/application_controller.rb | 3 -
services/keep-web/handler.go | 1 +
services/keepstore/s3_volume.go | 2 +-
services/nodemanager/arvnodeman/baseactor.py | 8 +-
.../arvnodeman/computenode/dispatch/__init__.py | 6 +
.../arvnodeman/computenode/dispatch/slurm.py | 2 +-
services/nodemanager/arvnodeman/timedcallback.py | 8 +-
services/nodemanager/setup.py | 2 +-
services/nodemanager/tests/stress_test.cwl | 51 +++++++++
.../nodemanager/tests/test_computenode_dispatch.py | 13 ++-
.../tests/test_computenode_dispatch_slurm.py | 25 +++--
services/nodemanager/tests/test_daemon.py | 102 ++++++++---------
services/nodemanager/tests/test_failure.py | 35 +++---
services/nodemanager/tests/test_jobqueue.py | 2 +-
services/nodemanager/tests/test_timedcallback.py | 37 ++++---
services/nodemanager/tests/testutil.py | 11 +-
services/ws/event_source.go | 3 +-
services/ws/handler.go | 20 ++--
services/ws/session_v0.go | 4 +
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 14 ++-
47 files changed, 464 insertions(+), 394 deletions(-)
create mode 100644 services/nodemanager/tests/stress_test.cwl
discards 294b9ea0be8e0f793658b1fb26a271b41d5cc805 (commit)
via 2f9091d71a40dfad185232f3400a79377f5f305b (commit)
via e38ac44d14e9006c24c93bca9de1ee299b16d367 (commit)
via 0b4800608e6394d66deec9cecea610c5fbbd75ad (commit)
via 3a356c4d0b8ea00c6a190c07ae2bf3093182cfd8 (commit)
via 6f2ce945ee9ad422c3b28fb6433e22d816dddfe1 (commit)
via 4097662dfde5d1c1eee3d7a0733f5c02234b9698 (commit)
via 9a26fa413d0890eac3a2578876508efc2cd32374 (commit)
via 0c356edf482e4ef2bb32dddde8eabe562adcfd8a (commit)
via 9deb1c897c821937563d863ed07fb5dee9de55b6 (commit)
via 51fe3482a5253d054e838fb1dcf3982f79650cee (commit)
via 09e62332e52606a4dccb8999ead54eb21eab5741 (commit)
via 81352ba328283d7ca2250b90bdfbaa305d5c3355 (commit)
via 78f9bd9ee7166139483991f5e1517fa49f310ac2 (commit)
via 60a39c8be294d58f22c6cb1efe6fc1d850411d60 (commit)
via c2943635432441ac6a54f893ddbfee311ffe5908 (commit)
via 10402f74ccdae453ae353c389a02c0415adcf1e7 (commit)
via 3394f8aa804e1da0bdf1f5d1457063974d944778 (commit)
via 33f91bb5a4ed93e9cadf21920526daa53351dbea (commit)
via 6e2df2d9a6578e60de4698a37a0b506004f76416 (commit)
via 7049888ba3001baa7e6428c056f2d5d03789747a (commit)
via 2bef371e8429430942193fff02599ec51c081e70 (commit)
via a6607cd8ce8f22da697af64354cad54c1acce74f (commit)
via d0a4adabafa4d132ab2333338c941acc57ca82fb (commit)
via 36b4355956d23f3b7402fba0e18318fc70e31e27 (commit)
via 3224524c1a2d6790322448565cb5a16ea0bcb874 (commit)
via 4c0dadce18cdc9fd2712b836100a4cf7b9c69188 (commit)
via 7b93dc26eb285261a6a431daa511edfb7392a3a1 (commit)
via 0413abf93d7ee0cfd10222bf04aa88c4e7460303 (commit)
via 651e87d8d97edebd8d3cd0325dbd15d6dac0cd1c (commit)
via 47643ae4e47687aa985f0228771579bdc45aa076 (commit)
via e4a35f3914481226a2a4ff57618bc486839aa2ea (commit)
via c6b308956e35d2221bf0be39bea73528ad664041 (commit)
via 02a0ac50b218e518c3ffbcd35c05ae7220450e2a (commit)
via 82d2cce62202d2a17ee184ad2923492f3abaac56 (commit)
via b61a80b93308582b91e89561dc373a1ea33658a9 (commit)
via 5b54a802c12f1bfd78fe08a3015870f85886032d (commit)
via e19efd044f4aa88af59f35f43c9b1118df36efc0 (commit)
via 366381df5e5e7763e0621c1da5b7f773ec7702d6 (commit)
via 61bde67a2ca4b49b1609336869c145c99abad7f6 (commit)
via 57647945b08a74bab02fed6adf947eb9adb8321f (commit)
via 5f215fab16860dfa066fcc4e35bc89337b1af7d9 (commit)
via cd94cea680540c12d4d6a44e4c528e7c44ad5268 (commit)
via 323a439a98cec4d97989e42d8d365fc36338ae35 (commit)
via f007b09f1469e189ba1f459de03181df04ac4c5d (commit)
via 3149e7de8530b592b366a62bc5563dac6b2d62ce (commit)
via f12b4e8995e88f9763b74ad48d0618f98879a31b (commit)
via 9c6540b9d42adc4a397a28be1ac23f357ba14ab5 (commit)
via b3884a22d82254d016adfc767a274e98e4303e44 (commit)
via 64b837f87103a59efb6d4dac2b8dfa3c7c40c09a (commit)
via 597b742a61cfb50e80af16beb0971827fc9b5b71 (commit)
via e6cc23100178e5edc90f8e9d04e6c663944b5da9 (commit)
via ca4049e73a6a27ce2217cf8650f48c0e15e111e9 (commit)
via a4ce464efa14acefeaa314f1be8b1c7b3b740778 (commit)
via 6706c6d46c6cfb080371b147b60fcaa191bd55a6 (commit)
via 23546c221e32f08c866e498da8aadb35d904166a (commit)
via b02fc7b2227e923beb4d47daee7949c94b90da5f (commit)
via 9bcdc4d79859742c44e09e606cbcdd64c7377e5f (commit)
via acd3d380bb636ca7ef324e0903e54e309b132dc7 (commit)
via 7a78b6728122c56343d68502192445ae476d24b0 (commit)
via f60671ae8a57caf2f72defb3da62998bdd83350e (commit)
via 08b59c7e5670b139346b0412c8a8bb9f3d3bf9ee (commit)
via 2918ed81152a1fe8607f433e36dceddc1cb78f74 (commit)
via 12319740a7d95c099a5521fd85a3200528307de1 (commit)
via 1dd3f0e144b5102128f18974f48f620aaf7b78b3 (commit)
via 9997ada67ce36d2fbe831bce473aa61250727aff (commit)
via 8f3070e16d4eaa581555f63e74ebe578927bfcce (commit)
via c7187ec723f28d676661ef4f44c9ddcef14b2546 (commit)
via 058e06eb085bae6c72de28a6a88096a8643e7322 (commit)
via cd698336f2b7aebe78517993e0b3b07b45c16c87 (commit)
via f291a43f7154d634a417bff32b9b81c197feb461 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (294b9ea0be8e0f793658b1fb26a271b41d5cc805)
\
N -- N -- N (2f9091d71a40dfad185232f3400a79377f5f305b)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 2f9091d71a40dfad185232f3400a79377f5f305b
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Aug 17 13:19:38 2017 -0400
12033: Restore "rake npm:install" step to arvbox.
Reverts 4097662dfde5d1c1eee3d7a0733f5c02234b9698.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index 5c9cd53..d0e855f 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -13,6 +13,7 @@ export RAILS_ENV=development
run_bundler --without=development
bundle exec passenger start --runtime-check-only --runtime-dir=/var/lib/passenger
+RAILS_GROUPS=assets bundle exec rake npm:install
if test "$1" = "--only-deps" ; then
exit
commit e38ac44d14e9006c24c93bca9de1ee299b16d367
Merge: 67616c4 0b48006
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Aug 17 13:18:41 2017 -0400
Merge branch 'master' into 12033-multisite-search
refs #12033
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --cc build/run-build-packages.sh
index af90eb6,2958d33..2cde946
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@@ -620,8 -620,8 +620,9 @@@ if [[ "$?" == "0" ]] ; the
\cp config/application.yml.example config/application.yml -f
\cp config/environments/production.rb.example config/environments/production.rb -f
sed -i 's/secret_token: ~/secret_token: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/' config/application.yml
+ sed -i 's/keep_web_url: false/keep_web_url: exampledotcom/' config/application.yml
+ RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake npm:install >/dev/null
RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake assets:precompile >/dev/null
# Remove generated configuration files so they don't go in the package.
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list