[arvados] updated: 2.1.0-2563-g4ac7c5a26

[git repository hosting]

Summary of changes:
 build/run-tests.sh                | 9 +++++++--
 lib/crunchrun/integration_test.go | 9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

       via  4ac7c5a26e9d5ba203edeaed242627be2bf9dbf8 (commit)
       via  8486a93eb80d0ba888c7795747bbba81f1c2c16f (commit)
      from  cab1fdf123d680195145b817f2227d84276e7436 (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 4ac7c5a26e9d5ba203edeaed242627be2bf9dbf8
Author: Tom Clegg <tom at curii.com>
Date:   Tue May 31 10:27:00 2022 -0400

    15370: Ensure keep data dirs exists for test.
    
    ...instead of assuming some other test suite has created them by
    calling arvadostest.StartKeep().
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index a9a270b07..3f7c7e50f 100644
--- a/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@ -20,6 +20,7 @@ import (
 	"git.arvados.org/arvados.git/sdk/go/arvadostest"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	"git.arvados.org/arvados.git/sdk/go/keepclient"
+	"git.arvados.org/arvados.git/services/keepstore"
 	. "gopkg.in/check.v1"
 )
 
@@ -193,6 +194,14 @@ func (s *integrationSuite) TestRunTrivialContainerWithLocalKeepstore(c *C) {
 			volume.AccessViaHosts = nil
 			volume.Replication = 2
 			cluster.Volumes[uuid] = volume
+
+			var v keepstore.UnixVolume
+			err = json.Unmarshal(volume.DriverParameters, &v)
+			c.Assert(err, IsNil)
+			err = os.Mkdir(v.Root, 0777)
+			if !os.IsExist(err) {
+				c.Assert(err, IsNil)
+			}
 		}
 		cluster.Containers.LocalKeepLogsToContainerLog = trial.logConfig
 

commit 8486a93eb80d0ba888c7795747bbba81f1c2c16f
Author: Tom Clegg <tom at curii.com>
Date:   Tue May 31 09:53:34 2022 -0400

    15370: Allow 20m for arvados-package tests.
    
    First run is slow, with no cached docker image.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index cc8e070a5..ee52c4b9d 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -69,6 +69,7 @@ apps/workbench_integration (*)
 apps/workbench_benchmark
 apps/workbench_profile
 cmd/arvados-client
+cmd/arvados-package
 cmd/arvados-server
 doc
 lib/cli
@@ -760,6 +761,10 @@ do_test_once() {
     then
         covername="coverage-$(echo "$1" | sed -e 's/\//_/g')"
         coverflags=("-covermode=count" "-coverprofile=$WORKSPACE/tmp/.$covername.tmp")
+        testflags=()
+        if [[ "$1" == "cmd/arvados-package" ]]; then
+            testflags+=("-timeout" "20m")
+        fi
         # We do "go install" here to catch compilation errors
         # before trying "go test". Otherwise, coverage-reporting
         # mode makes Go show the wrong line numbers when reporting
@@ -770,11 +775,11 @@ do_test_once() {
         then
             # "go test -check.vv giturl" doesn't work, but this
             # does:
-            go test ${short:+-short} ${testargs[$1]}
+            go test ${short:+-short} ${testflags[@]} ${testargs[$1]}
         else
             # The above form gets verbose even when testargs is
             # empty, so use this form in such cases:
-            go test ${short:+-short} ${coverflags[@]} "git.arvados.org/arvados.git/$1"
+            go test ${short:+-short} ${testflags[@]} ${coverflags[@]} "git.arvados.org/arvados.git/$1"
         fi
         result=${result:-$?}
         if [[ -f "$WORKSPACE/tmp/.$covername.tmp" ]]

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


hooks/post-receive
--