[ARVADOS] updated: 2.1.0-27-g9c36fdb89

[Git user]

Summary of changes:
 sdk/go/arvados/container.go                       | 2 +-
 services/api/test/fixtures/container_requests.yml | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

       via  9c36fdb897bc73658b64188f0bb94c580b2029f8 (commit)
       via  09790277299e0762fcba55bc2e1afdde636eb531 (commit)
       via  c85f61a83cd4fcf0b7aafa1670df488f4059a180 (commit)
      from  2e0aa69b41b141f23aadca9f59fa614c217c58a3 (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 9c36fdb897bc73658b64188f0bb94c580b2029f8
Merge: 2e0aa69b4 097902772
Author: Nico Cesar <nico at nicocesar.com>
Date:   Tue Nov 3 09:52:31 2020 -0500

    Merge branch '17014-controller-cr-ldp' of git.arvados.org:arvados into 17014-controller-cr
    
    Arvados-DCO-1.1-Signed-off-by: <nico at curii.com>


commit 09790277299e0762fcba55bc2e1afdde636eb531
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Mon Nov 2 17:07:42 2020 -0300

    17014: Allows ContainerRequest's container_uuid member to be NULL.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index d97116eab..f35db712d 100644
--- a/sdk/go/arvados/container.go
+++ b/sdk/go/arvados/container.go
@@ -48,7 +48,7 @@ type ContainerRequest struct {
 	Properties              map[string]interface{} `json:"properties"`
 	State                   ContainerRequestState  `json:"state"`
 	RequestingContainerUUID string                 `json:"requesting_container_uuid"`
-	ContainerUUID           string                 `json:"container_uuid"`
+	ContainerUUID           *string                `json:"container_uuid"`
 	ContainerCountMax       int                    `json:"container_count_max"`
 	Mounts                  map[string]Mount       `json:"mounts"`
 	RuntimeConstraints      RuntimeConstraints     `json:"runtime_constraints"`

commit c85f61a83cd4fcf0b7aafa1670df488f4059a180
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Mon Nov 2 15:31:12 2020 -0300

    17014: Fixture fix (WIP)
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index 4d64e59f9..daaaf4d08 100644
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -328,21 +328,22 @@ completed_with_input_mounts:
   output_uuid: zzzzz-4zz18-znfnqtbbv4spc3w
   mounts: {
     "/var/lib/cwl/cwl.input.json": {
+      "kind": "json",
       "content": {
         "input1": {
           "basename": "foo",
           "class": "File",
           "location": "keep:fa7aeb5140e2848d39b416daeef4ffc5+45/foo",
         },
-         "input2": {
+        "input2": {
           "basename": "bar",
           "class": "File",
           "location": "keep:fa7aeb5140e2848d39b416daeef4ffc5+45/bar",
-          }
-        },
-    "/var/lib/cwl/workflow.json": "keep:f9ddda46bb293b6847da984e3aa735db+290"
+        }
+      }
+    }
   }
-}
+
 uncommitted:
   uuid: zzzzz-xvhdp-cr4uncommittedc
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz

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


hooks/post-receive
--