[ARVADOS] updated: 289f610d23d5fcb0e9deacea90e67e3f36b41077
git at public.curoverse.com
git at public.curoverse.com
Mon Sep 15 12:02:15 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/selection.js | 9 +--
.../app/controllers/actions_controller.rb | 8 ++-
.../app/controllers/user_agreements_controller.rb | 2 +-
.../app/views/collections/_show_files.html.erb | 45 +++++++++++---
.../app/views/collections/_show_recent.html.erb | 21 +++++++
.../collections/_show_source_summary.html.erb | 5 +-
.../app/views/projects/_show_tab_contents.html.erb | 12 +++-
apps/workbench/config/application.default.yml | 3 +
apps/workbench/config/routes.rb | 1 +
.../test/functional/actions_controller_test.rb | 30 ++++++++++
.../workbench/test/integration/collections_test.rb | 70 ++++++++++++++++++++++
apps/workbench/test/integration/projects_test.rb | 27 +++++++++
crunch_scripts/split-fastq.py | 7 ++-
sdk/cli/bin/arv-run-pipeline-instance | 11 +++-
sdk/cli/bin/crunch-job | 6 ++
sdk/python/arvados/collection.py | 2 +-
services/api/Gemfile | 4 +-
services/api/Gemfile.lock | 8 +--
services/api/app/models/job_task.rb | 2 +
services/api/app/models/pipeline_instance.rb | 2 +
...add_start_finish_time_to_tasks_and_pipelines.rb | 15 +++++
services/api/db/structure.sql | 10 +++-
22 files changed, 270 insertions(+), 30 deletions(-)
create mode 100644 services/api/db/migrate/20140909183946_add_start_finish_time_to_tasks_and_pipelines.rb
via 289f610d23d5fcb0e9deacea90e67e3f36b41077 (commit)
via bf243e064a7a2ee4e69a87dc3ba46e949a545150 (commit)
via 9a88a95c52bf3b1da8152ab382de5b78be8568eb (commit)
via f43a783466bf8257781bac0acfa14008b2d532a1 (commit)
via b53be4b88fce28f4aa08da8d869653fcb7edb062 (commit)
via c78412ea3d188e3e035b285d10f89cf592b21071 (commit)
via e5152a25b9f9803522c15ff6397545f68d1d07a2 (commit)
via 132db914689be8338c16ea3d6748d073af2a6240 (commit)
via ac594f16176901b7692be354045226e093b14218 (commit)
via 00a0690c32f29f7d2c1b6030dd01578d98ea6dd6 (commit)
via 2109516cd314190311d837fcf40576c87dd38cd1 (commit)
via bc8c85ca59ff590ae2e336fc4552ec265d5ebb50 (commit)
via a9619cd9d563b5c434da6a11566517cacb410124 (commit)
via 35bf7a16482b304908c5b6bf3cd772647158f593 (commit)
via 8012f6cc74ca6e39d6f4bbf097a66eee19f0c4da (commit)
via 2d911a46e2698f18200bf2170bdb4c18452439a1 (commit)
via 35bee4f8071099b57925a49fc56554ceda900c81 (commit)
via f2bed1a9d44ccee1a5e1214e139d586b60b90e6a (commit)
via e7973cab8f9fc9531e4d928e73928e6eab022f48 (commit)
via 655d5ae89e941c8b11bd4ba795e9ef2168463881 (commit)
via a3615da860d1d78d0ecb7e2890eea26963b5c01e (commit)
via 960925be39948cda7f6ff0775887ba411a4e82ea (commit)
via e5ab4ce19d5ace5e6dd5cd32c23f50b35d20c8ef (commit)
via 300729d2ef4d0e7b9d86444c4a784b7e0b3beb6d (commit)
via 7e3496abb1b8c70607df37b6f096c8acd42d714d (commit)
via 2b96f0945cfdbda223227b96393a5f77aff477a4 (commit)
via 43d6c4e398e53a43f5b52c556128a33c8f84f5a3 (commit)
via e386cf444082ac341978887fb8d2b3b13cbba060 (commit)
via 2e255fb4aa0a1b7e0acfb1298a1625629ca18846 (commit)
via 08b394b0df66374a75dab082ca858dda6e4beae3 (commit)
via 852573d60776116bed4e86431667abf8c77d3f9a (commit)
via 5faed0c0ad219bd32182ecf5029a363587d4e863 (commit)
via e7a9c2edbf0b3843940446077a45ad4c911727ab (commit)
via 34081b99f265f9baaabcd791f7c520c3f5b37f19 (commit)
via a6a9e10686e3ffc8c56b0aad61633524be7e5cc4 (commit)
via 9564076de96d8c0084cf00f47348c41d6abfe673 (commit)
via 74ac5edcb6ecff4003ec70cf904c900392a31814 (commit)
via 8c4233dae52c96ceb629d2be1be73b518118863a (commit)
via e322205a65bdc3a0565997eb68c86e74cd191762 (commit)
via fd910ade561ddec093ec29a79a216259e53bef90 (commit)
via c90d8145634022d2d0c66b36bfb99e4c21248fed (commit)
via 498f3130928f58e830be3abe74b20d06904af3cd (commit)
via 33710e325a775d8f52ce89ce365b4a5153a68b18 (commit)
from 7082cec0e3dea1de16209b205e8fd053efa96490 (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 289f610d23d5fcb0e9deacea90e67e3f36b41077
Merge: 7082cec bf243e0
Author: radhika <radhika at curoverse.com>
Date: Mon Sep 15 12:01:58 2014 -0400
Merge branch 'master' into 2761-diagnostic-suite
Conflicts:
apps/workbench/config/application.default.yml
diff --cc apps/workbench/config/application.default.yml
index b2963af,893b28c..c097ea3
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@@ -142,32 -142,5 +142,35 @@@ common
issue_reporter_email_to: arvados at example.com
support_email_address: arvados at example.com
+ # Configuration for diagnostics testing. Use this to enable diagnostics testing for an env.
+ diagnostics_testing_user_tokens: false
+ diagnostics_testing_pipeline_fields: false
+
+ # Below is a sample setting for diagnostics testing.
+ # Configure test user tokens as "diagnostics_testing_user_tokens".
+ # At this time the tests need an "active" user token.
+ # Also, configure the pipelines to be executed as "diagnostics_testing_pipeline_fields".
+ # For each of the pipelines identified by the name of your choice
+ # ("tutorial pipeline" and "tutorial pipeline 2" in this sample):
+ # template_uuid: is the uuid of the template to be executed
+ # input_paths: an array of inputs for the pipeline. Use either a collection's "uuid"
+ # or a file's "uuid/file_name" path in this array. If the pipeline does not require
+ # any inputs, this can be omitted.
+ # max_wait_seconds: max time in seconds to wait for the pipeline run to complete.
+ # Default value of 30 seconds is used when this value is not provided.
+ #diagnostics_testing_user_tokens:
+ # active: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
+ #diagnostics_testing_pipeline_fields:
+ # pipeline with collection input:
+ # template_uuid: 4xphq-p5p6p-gsw68qb7owx1q2h
+ # input_paths: [qr1hi-4zz18-n1o4i1j5fvz6npu]
+ # max_wait_seconds: 100
+ # pipeline with file as input:
+ # template_uuid: 4xphq-p5p6p-gsw68qb7owx1q2h
+ # input_paths: [440e201c0141cb8a551b61fd7d07d2a1+83/qr1hi-8i9sb-j2tp8q1m2uf6a1o.log.txt]
+ # max_wait_seconds: 200
+ # pipeline with no inputs:
+ # template_uuid: 4xphq-p5p6p-gsw68qb7owx1q2h
++
+ # filename suffixes for which view icon would be shown in collection show page
+ filename_suffixes_with_view_icon: [txt, gif, jpeg, jpg, png, html, htm, pdf]
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list