[ARVADOS] updated: 374dff075f0d2961b3843d952ccca9f55d972e9a

[Git user]

Summary of changes:
 .../install-dispatch.html.textile.liquid           | 15 ++++
 sdk/python/arvados/api.py                          |  3 +-
 sdk/python/arvados/cache.py                        | 71 +++++++++++++++++++
 sdk/python/tests/run_test_server.py                |  5 +-
 sdk/python/tests/test_cache.py                     | 82 ++++++++++++++++++++++
 services/api/lib/crunch_dispatch.rb                | 11 ++-
 services/api/test/unit/crunch_dispatch_test.rb     |  8 +--
 services/api/test/unit/fail_jobs_test.rb           |  8 +--
 services/crunch-run/crunchrun.go                   | 37 +++++++---
 9 files changed, 217 insertions(+), 23 deletions(-)
 create mode 100644 sdk/python/arvados/cache.py
 create mode 100644 sdk/python/tests/test_cache.py

       via  374dff075f0d2961b3843d952ccca9f55d972e9a (commit)
       via  1667f9860de21d29bbe32bb827db29eca62d9aeb (commit)
       via  c56743e301b49163a56482c13e49a01c9a0fd7dc (commit)
       via  ae970cb115251915c0a8e1052b23acdd2ab70fee (commit)
       via  a67faeeb159323d35d2a3229c7b5d014dc175767 (commit)
       via  82ff0337a99b7aaed626a624633b8c068dc5e142 (commit)
       via  950ae9635334cd1ca6a2738b185f6481cc3d771f (commit)
       via  83203f5c739ee0b0199e76babccb60e832a0de8e (commit)
       via  7772dca4096e64b1033fb9f42e604699ce07f782 (commit)
       via  514cd364c3cb27b633c1368cd06d6a54927c98a8 (commit)
       via  366780077def317818759e999263577d8a9f5064 (commit)
       via  e47fe8663303df51081a77646e061b11aa892df1 (commit)
       via  f0a34ecb9b41b7d4e35575803ba3dc283f369724 (commit)
       via  8d2dd8003b6e865033e372b5db76fc2244378964 (commit)
       via  2741b54c38ed1e32cc9f0129614a00d84f51bca8 (commit)
       via  077878d94771c25c25edfe01a98a523898916d9e (commit)
       via  79e53c0eed77396cb37f60b48be0c60fe7e0ab89 (commit)
       via  f31475dfeb37c0e4d6b5244cba3bbd06e323b8e8 (commit)
      from  e468c36bcc610e9b5f4537c64de325e88660d89c (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 374dff075f0d2961b3843d952ccca9f55d972e9a
Merge: e468c36 1667f98
Author: radhika <radhika at curoverse.com>
Date:   Thu Mar 23 13:55:49 2017 -0400

    Merge branch 'master' into 9132-dockerclient
    
    Conflicts:
    	services/crunch-run/crunchrun.go

diff --cc services/crunch-run/crunchrun.go
index 0fb1030,062126d..94a1b9c
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@@ -712,6 -661,15 +715,15 @@@ func (runner *ContainerRunner) CreateCo
  	for k, v := range runner.Container.Environment {
  		runner.ContainerConfig.Env = append(runner.ContainerConfig.Env, k+"="+v)
  	}
+ 
 -	runner.HostConfig = dockerclient.HostConfig{
 -		Binds:        runner.Binds,
 -		CgroupParent: runner.setCgroupParent,
 -		LogConfig: dockerclient.LogConfig{
++	runner.HostConfig = dockercontainer.HostConfig{
++		Binds:  runner.Binds,
++		Cgroup: dockercontainer.CgroupSpec(runner.setCgroupParent),
++		LogConfig: dockercontainer.LogConfig{
+ 			Type: "none",
+ 		},
+ 	}
+ 
  	if wantAPI := runner.Container.RuntimeConstraints.API; wantAPI != nil && *wantAPI {
  		tok, err := runner.ContainerToken()
  		if err != nil {
@@@ -722,23 -680,20 +734,20 @@@
  			"ARVADOS_API_HOST="+os.Getenv("ARVADOS_API_HOST"),
  			"ARVADOS_API_HOST_INSECURE="+os.Getenv("ARVADOS_API_HOST_INSECURE"),
  		)
- 		runner.ContainerConfig.NetworkDisabled = false
 -		runner.HostConfig.NetworkMode = runner.networkMode
++		runner.HostConfig.NetworkMode = dockercontainer.NetworkMode(runner.networkMode)
  	} else {
- 		runner.ContainerConfig.NetworkDisabled = true
+ 		if runner.enableNetwork == "always" {
 -			runner.HostConfig.NetworkMode = runner.networkMode
++			runner.HostConfig.NetworkMode = dockercontainer.NetworkMode(runner.networkMode)
+ 		} else {
+ 			runner.HostConfig.NetworkMode = "none"
+ 		}
  	}
  
 -	var err error
 -	runner.ContainerID, err = runner.Docker.CreateContainer(&runner.ContainerConfig, "", nil)
 +	createdBody, err := runner.Docker.ContainerCreate(context.TODO(), &runner.ContainerConfig, nil, nil, "")
  	if err != nil {
  		return fmt.Errorf("While creating container: %v", err)
  	}
 +	runner.ContainerID = createdBody.ID
- 	runner.HostConfig = dockercontainer.HostConfig{
- 		Binds:  runner.Binds,
- 		Cgroup: dockercontainer.CgroupSpec(runner.setCgroupParent),
- 		LogConfig: dockercontainer.LogConfig{
- 			Type: "none",
- 		},
- 	}
  
  	return runner.AttachStreams()
  }

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


hooks/post-receive
--