[ARVADOS] updated: 3ef580c47029ff0fbf959b044f29c183f41cb609

Git user git at public.curoverse.com
Tue Apr 25 01:19:22 EDT 2017


Summary of changes:
 .../app/assets/javascripts/edit_collection.js      |  45 +++++++
 .../app/assets/javascripts/selection.js.erb        |   7 ++
 .../app/assets/stylesheets/collections.css.scss    |   6 +
 .../app/controllers/keep_disks_controller.rb       |   1 +
 apps/workbench/app/controllers/users_controller.rb |   1 +
 apps/workbench/app/helpers/application_helper.rb   |   2 +
 apps/workbench/app/models/arvados_base.rb          |   4 +
 apps/workbench/app/models/arvados_resource_list.rb |   8 ++
 apps/workbench/app/models/job.rb                   |   2 +-
 apps/workbench/app/models/pipeline_instance.rb     |   7 +-
 apps/workbench/app/models/proxy_work_unit.rb       |   1 +
 apps/workbench/app/models/workflow.rb              |   8 ++
 .../app/views/application/_content.html.erb        |   2 +-
 .../collections/_extra_tab_line_buttons.html.erb   |   3 +
 .../app/views/collections/_show_files.html.erb     |  14 ++-
 .../_extra_tab_line_buttons.html.erb               |   2 +-
 .../app/views/workflows/_show_recent.html.erb      |  65 ++++++++++
 .../test/integration/collection_upload_test.rb     |  14 +++
 .../workbench/test/integration/collections_test.rb |  67 +++++++++-
 apps/workbench/test/integration/work_units_test.rb |  24 ++++
 apps/workbench/test/integration_helper.rb          |  15 +++
 .../test/unit/arvados_resource_list_test.rb        |   8 ++
 apps/workbench/test/unit/link_test.rb              |   3 +
 apps/workbench/test/unit/pipeline_instance_test.rb |   3 +
 apps/workbench/test/unit/work_unit_test.rb         |   3 +
 build/build.list                                   |   2 +
 build/run-build-packages-sso.sh                    |   3 +
 build/run-build-packages.sh                        |   2 -
 build/run-library.sh                               |   2 +
 build/run-tests.sh                                 |   2 +-
 doc/_includes/_navbar_top.liquid                   |   2 +-
 .../install-nodemanager.html.textile.liquid        |  30 +++++
 doc/user/cwl/cwl-extensions.html.textile.liquid    |  17 +++
 docker/migrate-docker19/build.sh                   |   2 +-
 docker/migrate-docker19/dnd.sh                     |   2 +-
 docker/migrate-docker19/migrate.sh                 |  62 +++++++--
 sdk/cli/bin/crunch-job                             |   8 +-
 sdk/cli/test/binstub_arv-mount/arv-mount           |   1 +
 .../test/binstub_clean_fail/{mount => arv-mount}   |   0
 sdk/cli/test/test_crunch-job.rb                    |   4 +-
 sdk/cwl/arvados_cwl/__init__.py                    |  69 +++++------
 sdk/cwl/arvados_cwl/arv-cwl-schema.yml             |  31 +++++
 sdk/cwl/arvados_cwl/arvcontainer.py                |  12 +-
 sdk/cwl/arvados_cwl/crunch_script.py               |  15 ++-
 sdk/cwl/arvados_cwl/fsaccess.py                    |  32 +++--
 sdk/cwl/arvados_cwl/pathmapper.py                  |  87 +++++++------
 sdk/cwl/arvados_cwl/runner.py                      |   2 +-
 sdk/cwl/setup.py                                   |   6 +-
 sdk/cwl/test_with_arvbox.sh                        |   2 +
 sdk/cwl/tests/arvados-tests.yml                    |  36 ++++++
 sdk/cwl/tests/listing-job.yml                      |   3 +
 sdk/cwl/tests/test_container.py                    |  81 +++++++++++-
 sdk/cwl/tests/test_fsaccess.py                     |  28 +++++
 sdk/cwl/tests/test_job.py                          |   9 +-
 sdk/cwl/tests/test_pathmapper.py                   |  25 ++--
 sdk/cwl/tests/test_submit.py                       |  25 ++--
 .../cwl/tests/tmp1/tmp2/tmp3}/.gitkeep             |   0
 sdk/cwl/tests/wf/listing_deep.cwl                  |  15 +++
 sdk/cwl/tests/wf/listing_none.cwl                  |  15 +++
 sdk/cwl/tests/wf/listing_shallow.cwl               |  15 +++
 sdk/cwl/tests/wf/scatter2.cwl                      |   1 +
 sdk/cwl/tests/wf/scatter2_subwf.cwl                |   5 +-
 sdk/go/crunchrunner/crunchrunner.go                |  66 +++++-----
 sdk/go/crunchrunner/crunchrunner_test.go           |  51 ++++----
 sdk/go/dispatch/throttle_test.go                   |  29 +++--
 sdk/python/arvados/_ranges.py                      |   6 +-
 sdk/python/arvados/arvfile.py                      |  83 ++++++++++---
 sdk/python/arvados/commands/get.py                 |  16 ++-
 sdk/python/arvados/commands/migrate19.py           |  78 ++++++++++--
 sdk/python/arvados/commands/put.py                 |  29 +++--
 sdk/python/tests/test_arv_get.py                   |  49 ++++++--
 sdk/python/tests/test_arvfile.py                   | 134 +++++++++++++++++++-
 sdk/python/tests/test_stream.py                    |   7 +-
 services/api/app/models/node.rb                    |  20 ++-
 ...1_add_created_by_job_task_index_to_job_tasks.rb |   5 +
 ...0170419173712_add_object_owner_index_to_logs.rb |   5 +
 ...esting_container_index_to_container_requests.rb |   5 +
 services/api/db/structure.sql                      |  28 +++++
 services/api/test/unit/node_test.rb                |  12 ++
 services/crunch-run/crunchrun.go                   | 138 +++++++++++++++++----
 services/crunch-run/crunchrun_test.go              | 136 +++++++++++++++++++-
 services/keep-web/handler.go                       |  14 +++
 services/keep-web/handler_test.go                  |  31 +++++
 services/nodemanager/arvnodeman/config.py          |   2 +
 services/nodemanager/arvnodeman/daemon.py          |  17 +++
 services/nodemanager/arvnodeman/launcher.py        |   3 +
 services/nodemanager/arvnodeman/status.py          |  65 ++++++++++
 services/nodemanager/doc/azure.example.cfg         |  10 ++
 services/nodemanager/doc/ec2.example.cfg           |  10 ++
 services/nodemanager/doc/gce.example.cfg           |  10 ++
 services/nodemanager/doc/local.example.cfg         |   4 +
 services/nodemanager/setup.py                      |  22 ++--
 services/nodemanager/tests/test_daemon.py          |   8 ++
 services/nodemanager/tests/test_status.py          |  55 ++++++++
 94 files changed, 1771 insertions(+), 345 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/edit_collection.js
 create mode 100644 apps/workbench/app/views/collections/_extra_tab_line_buttons.html.erb
 create mode 100644 apps/workbench/app/views/workflows/_show_recent.html.erb
 create mode 100755 sdk/cli/test/binstub_arv-mount/arv-mount
 rename sdk/cli/test/binstub_clean_fail/{mount => arv-mount} (100%)
 create mode 100644 sdk/cwl/tests/listing-job.yml
 create mode 100644 sdk/cwl/tests/test_fsaccess.py
 copy {services/api/vendor/plugins => sdk/cwl/tests/tmp1/tmp2/tmp3}/.gitkeep (100%)
 create mode 100644 sdk/cwl/tests/wf/listing_deep.cwl
 create mode 100644 sdk/cwl/tests/wf/listing_none.cwl
 create mode 100644 sdk/cwl/tests/wf/listing_shallow.cwl
 create mode 100644 services/api/db/migrate/20170419173031_add_created_by_job_task_index_to_job_tasks.rb
 create mode 100644 services/api/db/migrate/20170419173712_add_object_owner_index_to_logs.rb
 create mode 100644 services/api/db/migrate/20170419175801_add_requesting_container_index_to_container_requests.rb
 create mode 100644 services/nodemanager/arvnodeman/status.py
 create mode 100644 services/nodemanager/tests/test_status.py

       via  3ef580c47029ff0fbf959b044f29c183f41cb609 (commit)
       via  bf5d77baad2071af6eea514c76b4892cec4974a0 (commit)
       via  04bd6b08b9ac13d29ac05c9281850d430d71066d (commit)
       via  840b855ff0317e66f4176ae0f23e9785f72267b4 (commit)
       via  1220e2184449ccab288fa41de4749fb029cd317b (commit)
       via  17b80c32a5b177ee8c5f32b81dd0889f3399eee8 (commit)
       via  35c2572761bb060aa1c12f417f97aa9e1ccbe7eb (commit)
       via  b04638275cff9b393e1bc04136d44f361b999cf8 (commit)
       via  c39ba5193005a4e9f619901f8348f11fada88df0 (commit)
       via  2333472a4f517a227278f028bbbc4e72687c0e71 (commit)
       via  5180238a10bd15302a1c15b9a428f2fdeeabdf4e (commit)
       via  bfc9660a8b2467893baf131b20e83e76c41ae438 (commit)
       via  aed7702a67426dfd9d24b512c90df8e909162179 (commit)
       via  9aa83ad7b4de05dd2818885ed34111d4dcf322ea (commit)
       via  3c34e713aa343d56c7cea00a9c998b06dbf411d6 (commit)
       via  65e339856daf4b5c3a4a810cd3a5f1a8e386dc8c (commit)
       via  151df8c3b177e4971bfbdf68c87d89599dbe0812 (commit)
       via  e7284afa8ccb95994dcd2009015cafc6180e7187 (commit)
       via  82c40aa7d30cd8e68e2a1bdc0bd8bf03cdfea029 (commit)
       via  38a4b3c43a8a6cff5a00624436b8eaa5cbfbc76b (commit)
       via  f79536fda9dc40f480383caa69a35663702b2ba4 (commit)
       via  c14ae0edcb3c386e50f46218184e8dabcbc20a37 (commit)
       via  04951581a941697d68cdaf9af6661c3c412f1bce (commit)
       via  de99c0b2effdd43d3843f15475cee84dbde8add8 (commit)
       via  e3ac17f8a8aa439e21a8bf56a571f91a671313f7 (commit)
       via  244c47436f294638271eef637997fd00f7ca49f5 (commit)
       via  67ba19113789346005aa61d4234bc33c8677a85c (commit)
       via  9609f9a5a4776671f571f765a179506d26df56da (commit)
       via  03188ad6eb14ee3dcd6bdf74198624c9358936c5 (commit)
       via  692a66affa483483d67931a6b095b361bfd06d24 (commit)
       via  243701b66914b69c9f9a94364e84713c8fcbc1da (commit)
       via  ea40bcae7a5d247ba8667c8c866339c2a8424464 (commit)
       via  cf311e8e16ba74467c77b5353afedc29b40a6a41 (commit)
       via  20364bc1aed2dcad71b006f4314ba0720d20ae05 (commit)
       via  72a377c59d972dd64de6e500c140738ff4b3dea6 (commit)
       via  fc2eaa20275146369e451da6cf14f4461c68117c (commit)
       via  bf55ee80e71c6503292a44fb377927f2ed908f9b (commit)
       via  9cab6a09cca4153104694f0dd4644c5aa5f54b22 (commit)
       via  cbcb0fc8c3ebc85bf81ba9d50795d62db75efa6c (commit)
       via  e507e67ee50852fc44011127eb42f535fe2ae493 (commit)
       via  d64ed33e94700f8204ec8089c7b235cff918f9f7 (commit)
       via  88c26c6b2dd8752ec1ff8196f4af11369ea6adbb (commit)
       via  91f1e7009305109db0bfb6405adbd11357745bfc (commit)
       via  2001423a6eb7937a689414f3fa62be5b124812c1 (commit)
       via  3a88a5d8753593be89373c5b124fc5a8398457a0 (commit)
       via  defb299deab3be85644a7880cba492a73c2e7e62 (commit)
       via  5152e0bf159151eaf04d31b788d57bebf7ab089b (commit)
       via  a3488ff35d219b943f3f52c07914fddf2009a140 (commit)
       via  574dc168c559dd680d26be1306c4a3d8b936c6e8 (commit)
       via  da32ae2a73012ce55cb89b2de9a4716b2800eee1 (commit)
       via  2f06f0e4d5b9ef371463c65dd5cae19f5b385a17 (commit)
       via  29d77300205e485be6595d9cd9276c246f3f89b7 (commit)
       via  af78d389b0ad37858108b69fe5100443dc88eb4a (commit)
       via  0035033f6bf6db955b116e2e0cc052bc5c79d80e (commit)
       via  49a841a5179307f0c8d84f647a71f44fb2b4b26d (commit)
       via  bafff6941293d4cc12cda4209f1d7a2b10274ea3 (commit)
       via  cb47df6cc327a59efaa16170f840c2745162bc86 (commit)
       via  a734789218122d8ab0d8f766bac4d69c04db91bf (commit)
       via  00573cf7d28472bf926e8f610a256cd991879c8b (commit)
       via  4431b9c71fc08955a89d1af70de3a8d5174c6e9f (commit)
       via  f61c7d9445c216c2364734fb1da2bea00cfb581d (commit)
       via  9ea73e2a66dcb1311732d43ea052412546c625fe (commit)
       via  224098499104939fccdb07b39407937c61983687 (commit)
       via  d3a82af33386c99c0fd3d6471df7e6696560089c (commit)
       via  f70c457c73f1bff6314f8c3eb4ad7be0c44a5f1a (commit)
       via  1b290e512496287e389424f3950f660f83c1c59b (commit)
       via  cb4f8b337c56dd3e7a648dda86031ceba65ee6c4 (commit)
       via  d72f1d79c0a53056a7cecad6c65fd57a183059b0 (commit)
       via  c03283d4da26ac9a6551dd00b25882b14c258da3 (commit)
       via  e1bc430748edced07f43f6c8efd73bbf2d828ca0 (commit)
       via  76e3d80bcc1548daba7bca97711684e5d68c1624 (commit)
       via  777e716728a7da63ece00df7e5bb8be7f9a2a1a3 (commit)
       via  a6be53f6913862b3884c57e9e93a891f3cfec471 (commit)
       via  95ef2a6f4145d8c6058738b6de0bce098e3423d6 (commit)
       via  8be16cfc7e163cc96995be891e53050febfb1fca (commit)
       via  828161a7527c535e5c657cd17b79cd562475fe82 (commit)
       via  2c094e28cc4f19df4f6d0bc81355e7fc19e8c493 (commit)
       via  a779382603d2da2ec38ceb8a21262cc4f151f077 (commit)
       via  26eb8f4cba5dd20ae49bf509a9a772ee4fe8b396 (commit)
       via  be2a34c57eab7cc184c08ec1059554cb97911276 (commit)
       via  533bf8f1120c0f3fd74a31dfda990cc832b2aa51 (commit)
       via  96b6e26749f3a7076b585758d44244777cc628c6 (commit)
       via  f08a738f1565b2dabde28dc9e8d1bad9622d5529 (commit)
       via  466e0e2623bb85870943f48fe1ab3016dc32d652 (commit)
       via  c1ea9a2fdccc5e24554f8cf28296cbc0764c8bbc (commit)
       via  f9a1468065776ee71eb43c45e6813bfae69fe0e0 (commit)
       via  2f46fb5769f41ac9cddf8c46bd0d2ab094375e82 (commit)
       via  e7876a3ac520b128be7836e30172079ab2af5e45 (commit)
       via  ab9a73d2c0b567d3c05d1d4d8463633a69eafda2 (commit)
       via  3f5c2b95de8483e277a472846ad7e5b2ccb1f79a (commit)
       via  2ebd44960d1e7a0431d6ad612298012627c5019c (commit)
       via  3ceb42c882b32fb9e4ef79679576254f98cdfb3d (commit)
       via  8fd18fc4a32797fc3c6255099fc253d7aede12b5 (commit)
       via  ae69864e07d416d10879e00da416918ac021893f (commit)
       via  c3ae1e2f54d4199a9521bf3d4d515bcbb0711989 (commit)
       via  6da9f3666bc0ddee2d0be079cc30ba8b82804706 (commit)
       via  42e6998c32f8d5553133e4b0b3ea02cd0c6f5554 (commit)
       via  17f22a2b220c38ebae5247d09f8c96ceec151957 (commit)
       via  38141f7261a7a2fa29f9cf3281cc46c1d845c1c3 (commit)
       via  acb0bd431ced4814b37f703ca63f2b39ad29c5df (commit)
       via  433c48edb1523809bb8d43e4fc40ebe1a177e103 (commit)
       via  0708d4a0b6db9426b9bb5addc1c592d526bd4ecd (commit)
       via  25ab6bebfd55db837aa049e5c0fdb2ce28f98f30 (commit)
       via  201ddbd84144a10bbcbc72a3525bb0c4e743570d (commit)
       via  692ef5fd300fef4ef1b724016c1600dbcfc8a070 (commit)
       via  d7d00f5140b7622fdc55a4058be73b89d587b7b2 (commit)
       via  7bd9af41d106590856e4d8c317502d1f4f56aefd (commit)
       via  5cd99e52e342db19c1a77369a5a8c027ee04feaf (commit)
       via  33b9f9bd117931bae54f45566fb77e654dcbe263 (commit)
       via  6b0632d7706cbb344331bf5d291cafd541070cbb (commit)
       via  820d3244a25aa8b4658ab79cd8368492aeddc739 (commit)
      from  de083a9fec0ca08afda5a9369c6cd32dbdcd0965 (commit)

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 3ef580c47029ff0fbf959b044f29c183f41cb609
Merge: de083a9 bf5d77b
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Apr 25 01:14:23 2017 -0400

    7709: Merge branch 'master' into 7709-api-rails4
    
    Conflicts:
    	services/api/db/structure.sql

diff --cc services/api/db/structure.sql
index 5c592a2,d672942..3e1fa3f
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -2757,3 -2778,9 +2778,10 @@@ INSERT INTO schema_migrations (version
  INSERT INTO schema_migrations (version) VALUES ('20170328215436');
  
  INSERT INTO schema_migrations (version) VALUES ('20170330012505');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20170419173031');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20170419173712');
+ 
 -INSERT INTO schema_migrations (version) VALUES ('20170419175801');
++INSERT INTO schema_migrations (version) VALUES ('20170419175801');
++

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list