[ARVADOS] updated: 1.2.0-348-gaf0d3cc15

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go      | 75 ++---------------------------------
 services/crunch-run/crunchrun_test.go | 48 +++++-----------------
 vendor/vendor.json                    | 60 ----------------------------
 3 files changed, 13 insertions(+), 170 deletions(-)

       via  af0d3cc15a850fa75373424eeffd98d0075b4660 (commit)
       via  965f7cb4e759cf747e890b4478a94ea679fbb8f7 (commit)
       via  a12c63c7f1871378a2f72283052ff7171e545a12 (commit)
       via  0cd95d441aa5caaf0172abf89a686886fb0e3243 (commit)
      from  664cbad59d3fff30efb7e19c73fa57120a7672b0 (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 af0d3cc15a850fa75373424eeffd98d0075b4660
Merge: 664cbad59 965f7cb4e
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Nov 9 14:00:54 2018 -0500

    Merge branch '14328-containerd'
    
    closes #14328
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 965f7cb4e759cf747e890b4478a94ea679fbb8f7
Merge: a12c63c7f 664cbad59
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Nov 9 13:59:29 2018 -0500

    14328: Merge branch 'master'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --cc services/crunch-run/crunchrun.go
index 36d8394c7,7247b339d..e5a1b9470
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@@ -1674,10 -1748,21 +1693,10 @@@ func NewContainerRunner(dispatcherClien
  	cr.NewLogWriter = cr.NewArvLogWriter
  	cr.RunArvMount = cr.ArvMountCmd
  	cr.MkTempDir = ioutil.TempDir
- 	cr.MkArvClient = func(token string) (IArvadosClient, IKeepClient, error) {
 -	cr.ListProcesses = func() ([]PsProcess, error) {
 -		pr, err := process.Processes()
 -		if err != nil {
 -			return nil, err
 -		}
 -		ps := make([]PsProcess, len(pr))
 -		for i, j := range pr {
 -			ps[i] = j
 -		}
 -		return ps, nil
 -	}
+ 	cr.MkArvClient = func(token string) (IArvadosClient, IKeepClient, *arvados.Client, error) {
  		cl, err := arvadosclient.MakeArvadosClient()
  		if err != nil {
- 			return nil, nil, err
+ 			return nil, nil, nil, err
  		}
  		cl.ApiToken = token
  		kc, err := keepclient.MakeKeepClient(cl)

commit a12c63c7f1871378a2f72283052ff7171e545a12
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Nov 9 13:55:00 2018 -0500

    14328: Fix flaky test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index 89ba9e010..080518360 100644
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -826,7 +826,15 @@ func (s *TestSuite) fullRunHelper(c *C, record string, extraMounts []string, exi
 	}
 	if exitCode != 2 {
 		c.Check(api.WasSetRunning, Equals, true)
-		c.Check(api.Content[api.Calls-2]["container"].(arvadosclient.Dict)["log"], NotNil)
+		var lastupdate arvadosclient.Dict
+		for _, content := range api.Content {
+			if content["container"] != nil {
+				lastupdate = content["container"].(arvadosclient.Dict)
+			}
+		}
+		if lastupdate["log"] == nil {
+			c.Errorf("no container update with non-nil log -- updates were: %v", api.Content)
+		}
 	}
 
 	if err != nil {

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


hooks/post-receive
--