[ARVADOS] updated: 1.1.4-353-g76f6b35

[Git user]

Summary of changes:
 sdk/R/README.Rmd                                   |   2 +-
 sdk/cwl/arvados_cwl/__init__.py                    |   9 +-
 sdk/cwl/arvados_cwl/arvcontainer.py                |  32 ++-
 sdk/cwl/arvados_cwl/arvworkflow.py                 |   1 +
 sdk/cwl/arvados_cwl/crunch_script.py               |   1 +
 sdk/cwl/arvados_cwl/http.py                        | 141 ++++++++++
 sdk/cwl/arvados_cwl/pathmapper.py                  |   6 +
 sdk/cwl/arvados_version.py                         |   2 +-
 sdk/cwl/setup.py                                   |   4 +-
 sdk/cwl/tests/test_container.py                    |  16 +-
 sdk/cwl/tests/test_http.py                         | 286 +++++++++++++++++++++
 sdk/cwl/tests/test_job.py                          |   6 +-
 sdk/cwl/tests/test_submit.py                       |  29 ++-
 services/keep-balance/balance.go                   |  40 +--
 services/keepstore/s3_volume.go                    |   4 +-
 .../nodemanager/arvnodeman/computenode/__init__.py |   2 +-
 .../nodemanager/arvnodeman/test/fake_driver.py     |  13 +-
 services/nodemanager/tests/test_computenode.py     |   6 +
 services/nodemanager/tests/test_daemon.py          |  44 ++--
 services/nodemanager/tests/test_failure.py         |   5 +-
 20 files changed, 583 insertions(+), 66 deletions(-)
 create mode 100644 sdk/cwl/arvados_cwl/http.py
 create mode 100644 sdk/cwl/tests/test_http.py

       via  76f6b358cf612e67b586452236394feabc464373 (commit)
       via  5836e576fe0b78c50383cf56e1c4fb4521daeca1 (commit)
       via  1bff2ab0181be31492c53351afc1c3c1e58ea05d (commit)
       via  08f0ba557d67488933ddfa90030f80459efe7997 (commit)
       via  2f9761bd08293de1847d3dbd0ab16482eacc414d (commit)
       via  7e9b9d420b58c22c41a713b9bfbfd0f5718abb1a (commit)
       via  d8dfc75ec5c6cead3da0f3907466ce1b89373b69 (commit)
       via  67c988ea479ba47da2d8dc93695188f86833436d (commit)
       via  606c29cdbb9012ee99043a2da9f28b2cd302e5e4 (commit)
       via  05fdfcec08e280a03c532a1a98b3aeebc716f6eb (commit)
       via  c9abf73e0b57739a594aa1b4803726e612cf6313 (commit)
       via  f1cf835d576de364faa7e94f5ba8caca5ad7be43 (commit)
       via  52be0992a572473171d3fe9f0b4182f67201f052 (commit)
       via  cc36a001007e753bf413e55bdb52daf048ad05c4 (commit)
       via  739b1b9ec3662f988ad09509bcc933ce5c23c4e8 (commit)
       via  57e511e900aa1eb175fa7f308b09516ad83492b4 (commit)
       via  e4ea2e1dd1cb597b02d15bd7b9323705d6342f99 (commit)
       via  ddac86f6bae74398f58db75e383f5945c323a099 (commit)
       via  b3f04be24d0d2c75808dccd9e5923ee25371cb17 (commit)
       via  6e17218f2fc39a828af4d3a19bdb29243739dafd (commit)
       via  708a9f8e858f0791702083e3f429fcb3eea5af15 (commit)
       via  a7af6b95953992a7e9554b56604cf8248d5a2bf4 (commit)
       via  9a52f3d07288f8a0073736a2a273ddaeb97ddc18 (commit)
       via  6853ac7e518c5c6a888c5f5bd4edb27bdb564a2c (commit)
       via  2600c9f3e0cbe1072c1bc4887aa5febe8906ddec (commit)
      from  00cca6a192eb1ab38559bf5ed9044711ed56fc4a (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 76f6b358cf612e67b586452236394feabc464373
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Fri Jun 1 12:41:44 2018 -0300

    7478: Fixes integration tests.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/nodemanager/arvnodeman/test/fake_driver.py b/services/nodemanager/arvnodeman/test/fake_driver.py
index 978c6aa..11ba271 100644
--- a/services/nodemanager/arvnodeman/test/fake_driver.py
+++ b/services/nodemanager/arvnodeman/test/fake_driver.py
@@ -43,6 +43,9 @@ class FakeDriver(NodeDriver):
         global all_nodes, create_calls
         create_calls += 1
         nodeid = "node%i" % create_calls
+        if ex_tags is None:
+            ex_tags = {}
+        ex_tags.update({'arvados_node_size': size.id})
         n = Node(nodeid, nodeid, NodeState.RUNNING, [], [], self, size=size, extra={"tags": ex_tags})
         all_nodes.append(n)
         if ex_customdata:
@@ -161,7 +164,12 @@ class FakeAwsDriver(FakeDriver):
                                                       auth=auth,
                                                       ex_metadata=ex_metadata,
                                                       ex_userdata=ex_userdata)
-        n.extra = {"launch_time": time.strftime(ARVADOS_TIMEFMT, time.gmtime())[:-1]}
+        n.extra = {
+            "launch_time": time.strftime(ARVADOS_TIMEFMT, time.gmtime())[:-1],
+            "metadata" : {
+                "arvados_node_size": size.id
+            }
+        }
         return n
 
     def list_sizes(self, **kwargs):
@@ -187,7 +195,8 @@ class FakeGceDriver(FakeDriver):
                                                    ex_metadata=ex_metadata)
         n.extra = {
             "metadata": {
-                "items": [{"key": k, "value": v} for k,v in ex_metadata.iteritems()]
+                "items": [{"key": k, "value": v} for k,v in ex_metadata.iteritems()],
+                "arvados_node_size": size.id
             },
             "zone": "fake"
         }

commit 5836e576fe0b78c50383cf56e1c4fb4521daeca1
Merge: 00cca6a 1bff2ab
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Thu May 31 16:24:07 2018 -0300

    Merge branch 'master' into 7478-anm-spot-instances
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>


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


hooks/post-receive
--