[ARVADOS] updated: 67f5a1a4d8dde5bac538e7e8d102ca83dc3335d0

[Git user]

Summary of changes:
 doc/install/arvbox.html.textile.liquid             | 21 +++--
 sdk/cwl/arvados_cwl/__init__.py                    | 10 ++-
 sdk/cwl/test_with_arvbox.sh                        | 71 +++++++++++++++++
 tools/arvbox/bin/arvbox                            | 91 +++++++++++++++-------
 .../lib/arvbox/docker/service/ready/run-service    | 11 +--
 .../lib/arvbox/docker/service/sdk/run-service      |  4 +
 6 files changed, 166 insertions(+), 42 deletions(-)
 create mode 100755 sdk/cwl/test_with_arvbox.sh

       via  67f5a1a4d8dde5bac538e7e8d102ca83dc3335d0 (commit)
       via  a26464d38bbc004c2949152a6617ed0fb1b5353e (commit)
       via  e11ee6c48ee1ee0e02c48b739ca6989d9e9b2ae9 (commit)
       via  4bd414c0d951a5efc0927ef467f193b3e406a927 (commit)
       via  be8fb7271e3a416818cab04498e5b1ebe877b4fe (commit)
       via  0f9285a458f0f7a86d9877d5fcf65d3f9d14ec35 (commit)
       via  7c7a8660bd619a0d873835c778ae4c6f909a99f6 (commit)
       via  e83e6c3df34d07cf23a3f9d1d8a3553a0e1a0ea4 (commit)
       via  b3905ce85fcfc31df4309c32ee07ff4d943d5fd0 (commit)
      from  e6d8eb6d2415f15439ab6b7ab715ca962e7e7763 (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 67f5a1a4d8dde5bac538e7e8d102ca83dc3335d0
Author: radhika <radhika at curoverse.com>
Date:   Fri Mar 4 13:39:03 2016 -0500

    8558: include min_scratch_mb_per_node in the keys propagated

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index ca80795..e3a5480 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -154,16 +154,22 @@ class ArvadosJob(object):
 
         resources = self.builder.resources
         if resources is not None:
-            if "coresMin" in resources.keys():
+            keys = resources.keys()
+            if "coresMin" in keys:
                 try:
                     runtime_constraints["min_cores_per_node"] = int(resources["coresMin"])
                 except:
                     runtime_constraints["min_cores_per_node"] = None
-            if "ramMin" in resources.keys():
+            if "ramMin" in keys:
                 try:
                     runtime_constraints["min_ram_mb_per_node"] = int(resources["ramMin"])
                 except:
                     runtime_constraints["min_ram_mb_per_node"] = None
+            if "tmpdirMin" in keys:
+                try:
+                    runtime_constraints["min_scratch_mb_per_node"] = int(resources["tmpdirMin"])
+                except:
+                    runtime_constraints["min_scratch_mb_per_node"] = None
 
         try:
             response = self.arvrunner.api.jobs().create(body={

commit a26464d38bbc004c2949152a6617ed0fb1b5353e
Merge: e6d8eb6 e11ee6c
Author: radhika <radhika at curoverse.com>
Date:   Fri Mar 4 12:07:37 2016 -0500

    Merge branch 'master' into 8558-cwl-propagate-resource-req


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


hooks/post-receive
--