[ARVADOS] updated: 2.1.0-1080-gcc476f769

[Git user]

Summary of changes:
 lib/crunchrun/crunchrun_test.go      | 2 ++
 lib/crunchrun/singularity.go         | 8 ++++++++
 services/api/app/models/container.rb | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

       via  cc476f769c06ac6150a4f6d406eb2656f41e1dc3 (commit)
       via  89885a87ce97328bfeff8dc10f62c40b0cf54532 (commit)
      from  2d43f3de749909c040ea17460ec828047e6db7c2 (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 cc476f769c06ac6150a4f6d406eb2656f41e1dc3
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Jul 20 17:01:24 2021 -0400

    17813: Change default value of runtime_auth_scopes to []
    
    It is documented to be an array of strings, so having the default be
    an object just seems to be a mistake.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index ddae45818..af058494b 100644
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -21,7 +21,7 @@ class Container < ArvadosModel
   # already know how to properly treat them.
   attribute :secret_mounts, :jsonbHash, default: {}
   attribute :runtime_status, :jsonbHash, default: {}
-  attribute :runtime_auth_scopes, :jsonbHash, default: {}
+  attribute :runtime_auth_scopes, :jsonbArray, default: []
   attribute :output_storage_classes, :jsonbArray, default: ["default"]
 
   serialize :environment, Hash

commit 89885a87ce97328bfeff8dc10f62c40b0cf54532
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Jul 20 17:01:08 2021 -0400

    17813: Fix tests
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/crunchrun/crunchrun_test.go b/lib/crunchrun/crunchrun_test.go
index bb7ffdf03..7519319e3 100644
--- a/lib/crunchrun/crunchrun_test.go
+++ b/lib/crunchrun/crunchrun_test.go
@@ -122,6 +122,8 @@ func (e *stubExecutor) Close()                          { e.closed = true }
 func (e *stubExecutor) Wait(context.Context) (int, error) {
 	return <-e.exit, e.waitErr
 }
+func (e *stubExecutor) SetArvadoClient(containerClient *arvados.Client, keepClient IKeepClient, container arvados.Container, keepMount string) {
+}
 
 const fakeInputCollectionPDH = "ffffffffaaaaaaaa88888888eeeeeeee+1234"
 
diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go
index be2d18871..1a1567451 100644
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@ -79,6 +79,10 @@ func (e *singularityExecutor) getOrCreateProject(ownerUuid string, name string,
 }
 
 func (e *singularityExecutor) ImageLoaded(imageId string) bool {
+	if e.containerClient == nil {
+		return false
+	}
+
 	// Check if docker image is cached in keep & if so set imageFilename
 
 	// Cache the image to keep
@@ -159,6 +163,10 @@ func (e *singularityExecutor) LoadImage(imageTarballPath string) error {
 		return err
 	}
 
+	if e.containerClient == nil {
+		return nil
+	}
+
 	// Cache the image to keep
 	cacheGroup, err := e.getOrCreateProject(e.container.RuntimeUserUUID, ".cache", true)
 	if err != nil {

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


hooks/post-receive
--