[arvados] updated: 2.1.0-2557-g3fa6aa404
git repository hosting
git at public.arvados.org
Sat May 21 01:29:20 UTC 2022
Summary of changes:
apps/workbench/Gemfile.lock | 2 +-
.../app/controllers/application_controller.rb | 7 +-
.../app/views/projects/_show_dashboard.html.erb | 5 +-
build/run-tests.sh | 8 +-
cmd/arvados-client/container_gateway_test.go | 15 +-
cmd/arvados-package/build_test.go | 3 +
.../methods/container_requests.html.textile.liquid | 1 +
doc/api/methods/containers.html.textile.liquid | 1 +
doc/user/cwl/cwl-extensions.html.textile.liquid | 15 +-
lib/config/config.default.yml | 5 +-
lib/config/export.go | 1 +
lib/config/load.go | 19 +
lib/config/load_test.go | 27 +-
lib/controller/localdb/container_gateway_test.go | 11 +-
lib/crunchrun/container_gateway.go | 98 ++--
lib/crunchrun/crunchrun.go | 13 +-
lib/crunchrun/crunchrun_test.go | 4 +
lib/crunchrun/docker.go | 34 ++
lib/crunchrun/executor.go | 2 +
lib/crunchrun/executor_test.go | 89 +++
lib/crunchrun/integration_test.go | 3 +
lib/crunchrun/singularity.go | 143 ++++-
lib/crunchrun/singularity_test.go | 32 +-
lib/install/deps.go | 8 +
sdk/cwl/arvados_cwl/__init__.py | 1 +
sdk/cwl/arvados_cwl/arv-cwl-schema-v1.0.yml | 24 +-
sdk/cwl/arvados_cwl/arv-cwl-schema-v1.1.yml | 20 +
sdk/cwl/arvados_cwl/arv-cwl-schema-v1.2.yml | 20 +
sdk/cwl/arvados_cwl/arvcontainer.py | 21 +-
sdk/cwl/arvados_cwl/executor.py | 25 +-
sdk/cwl/arvados_cwl/util.py | 4 +-
.../{secondary/sub.cwl => 17004-output-props.cwl} | 21 +-
sdk/cwl/tests/arvados-tests.sh | 4 +
sdk/cwl/tests/test_container.py | 79 ++-
sdk/cwl/tests/test_make_output.py | 8 +-
sdk/cwl/tests/test_set_output_prop.py | 37 ++
sdk/cwl/tests/test_submit.py | 632 +++++++++++----------
sdk/go/arvados/container.go | 1 +
sdk/go/health/aggregator.go | 83 ++-
sdk/go/health/aggregator_test.go | 46 +-
sdk/python/arvados/api.py | 5 +
sdk/python/arvados/commands/get.py | 6 +-
sdk/python/tests/test_arv_get.py | 5 +-
services/api/Gemfile.lock | 2 +-
.../controllers/arvados/v1/schema_controller.rb | 2 +-
services/api/app/models/container.rb | 6 +-
services/api/app/models/container_request.rb | 29 +-
.../20220505112900_add_output_properties.rb | 31 +
services/api/db/structure.sql | 11 +-
services/api/test/unit/container_request_test.rb | 65 ++-
50 files changed, 1243 insertions(+), 491 deletions(-)
copy sdk/cwl/tests/{secondary/sub.cwl => 17004-output-props.cwl} (53%)
create mode 100644 sdk/cwl/tests/test_set_output_prop.py
create mode 100644 services/api/db/migrate/20220505112900_add_output_properties.rb
via 3fa6aa4043286ad61e5f29c136d3cc2942e8750d (commit)
via 4b593edcfee19c464e10baacd68fb267c7f22450 (commit)
via 6caeb0768adabd32b50cc2ca6eb49d162745c4b0 (commit)
via 36cfafd6e7eae2784c22aefdd9df26783412d42a (commit)
via 83f05664d99a7d80b2d2ae9c0517004cbfb5d00d (commit)
via dac27775017bab861a9fe3e3f85766df7cd8f80d (commit)
via 22f9af1104fa45e95ef3cd8b5a770fc0b9ed0fd3 (commit)
via 1457aaa7f0edfdb4c4cc7ff0bc42162fc9beede2 (commit)
via 14d8cfa18f28586ad296e3e598d0a2a536be0613 (commit)
via 7f9de270aa34467c1b1668be9333ec28d14b10a1 (commit)
via 469ea187586ea8017e26874c2d80414ce7571fae (commit)
via fd178c88e1f61ca4e809073ee5baafa26986eb59 (commit)
via c36ec856598f214e340e3335ddd347d131335bf8 (commit)
via f94acaa49ff3dada2083a2e9ae690b8652f16d3e (commit)
via aabea703ee77ca91da710dd9bce9716e5d35d7b2 (commit)
via f35aae3c6732a7e08253367517c61ab3071086d1 (commit)
via 991da6445dd3942bd7d736506507815b3982743f (commit)
via dcf8de623d744458d7e39a1efe3814349de76649 (commit)
via d58c2423e8e038e4c47c2329299059978abc7fbf (commit)
via c78c7272f9ab77297fbb4e521ab09fe9560754fe (commit)
via 554dc3c84338223df363a05a215919f7af90fc6a (commit)
via d49403ac749fffe24ac6357597e6014bb65efa30 (commit)
via 7285b2204d2650179782981dea2af454e607fd7f (commit)
via 1e7856bffea0d0ecfcf940de90243dea0fbd3c2f (commit)
via fee9186b62c23aa8a112b65626a44fab6b34b3fd (commit)
via f5b6bae39a2afec70fd3d232d0a9da5c5b9a3135 (commit)
via cf9afd31cf9bc682ea3f8c0d59012fa7080b0e9b (commit)
via a3d2b8e1de5b8c785846ddc57ae9a4c02bc51adc (commit)
via 1a1aac1de7389ae19d5132aeca515113c3b5ef54 (commit)
via a24e4872dc015304b76c33b1246e4a3fc5163711 (commit)
via a5dd553652713ea202d7ac4291836fac649031b4 (commit)
via d05ce2853bafa4a23314813c8d7cb32c4162a0b4 (commit)
via 757ee383a605de73773544001a4e61717e19ece8 (commit)
via 60e38e35f49de11b5752c2bfb7f9f10443d82c49 (commit)
via cc7736c79907fae63e80ff76779f8da2624520fd (commit)
via 503860c347e620432ee501c1edc245fca94bf729 (commit)
via 8c52491b9feedc523f5aa30721a5a496ebfe7ea6 (commit)
via 5331fde2afc6224b10e828ad09f3ffe05f7f4e5e (commit)
via 3ad49eb34f3c7c30588af3cab6a3c9a593dcd5ad (commit)
via e30b7ec3040cac89a2e134fddf8cb47c1905ea82 (commit)
via 2a21ea7ddc0739f9ce54589600be7f136ddd83fa (commit)
via 43fdb06a1620d926bdaec00582c82a4190805d86 (commit)
via 7ebe828a435dcaa1b5668b72adbaad495059f211 (commit)
from bcad695db9a1c3aac5807faa153086e653107f51 (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 3fa6aa4043286ad61e5f29c136d3cc2942e8750d
Merge: bcad695db 4b593edcf
Author: Tom Clegg <tom at curii.com>
Date: Fri May 20 21:28:53 2022 -0400
15370: Merge branch 'main' into 15370-loopback-dispatchcloud
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --cc lib/config/load_test.go
index 256e8a3e8,feb05cb95..fb9792632
--- a/lib/config/load_test.go
+++ b/lib/config/load_test.go
@@@ -602,55 -601,31 +602,80 @@@ func (s *LoadSuite) TestListKeys(c *che
}
}
+func (s *LoadSuite) TestLoopbackInstanceTypes(c *check.C) {
+ ldr := testLoader(c, `
+Clusters:
+ z1111:
+ Containers:
+ CloudVMs:
+ Enable: true
+ Driver: loopback
+ InstanceTypes:
+ a: {}
+ b: {}
+`, nil)
+ cfg, err := ldr.Load()
+ c.Check(err, check.ErrorMatches, `Clusters\.z1111\.InstanceTypes: cannot use multiple InstanceTypes with loopback driver`)
+
+ ldr = testLoader(c, `
+Clusters:
+ z1111:
+ Containers:
+ CloudVMs:
+ Enable: true
+ Driver: loopback
+`, nil)
+ cfg, err = ldr.Load()
+ c.Assert(err, check.IsNil)
+ cc, err := cfg.GetCluster("")
+ c.Assert(err, check.IsNil)
+ c.Check(cc.InstanceTypes, check.HasLen, 1)
+ c.Check(cc.InstanceTypes["localhost"].VCPUs, check.Equals, runtime.NumCPU())
+
+ ldr = testLoader(c, `
+Clusters:
+ z1111:
+ Containers:
+ CloudVMs:
+ Enable: true
+ Driver: loopback
+ InstanceTypes:
+ a:
+ VCPUs: 9
+`, nil)
+ cfg, err = ldr.Load()
+ c.Assert(err, check.IsNil)
+ cc, err = cfg.GetCluster("")
+ c.Assert(err, check.IsNil)
+ c.Check(cc.InstanceTypes, check.HasLen, 1)
+ c.Check(cc.InstanceTypes["a"].VCPUs, check.Equals, 9)
+}
+
+ func (s *LoadSuite) TestWarnUnusedLocalKeep(c *check.C) {
+ var logbuf bytes.Buffer
+ _, err := testLoader(c, `
+ Clusters:
+ z1111:
+ Volumes:
+ z:
+ Replication: 1
+ `, &logbuf).Load()
+ c.Assert(err, check.IsNil)
+ c.Check(logbuf.String(), check.Matches, `(?ms).*LocalKeepBlobBuffersPerVCPU is 1 but will not be used because at least one volume \(z\) has lower replication than DefaultReplication \(1 < 2\) -- suggest changing to 0.*`)
+
+ logbuf.Reset()
+ _, err = testLoader(c, `
+ Clusters:
+ z1111:
+ Volumes:
+ z:
+ AccessViaHosts:
+ "http://0.0.0.0:12345": {}
+ `, &logbuf).Load()
+ c.Assert(err, check.IsNil)
+ c.Check(logbuf.String(), check.Matches, `(?ms).*LocalKeepBlobBuffersPerVCPU is 1 but will not be used because at least one volume \(z\) uses AccessViaHosts -- suggest changing to 0.*`)
+ }
+
func (s *LoadSuite) TestImplicitStorageClasses(c *check.C) {
// If StorageClasses and Volumes.*.StorageClasses are all
// empty, there is a default storage class named "default".
diff --cc lib/crunchrun/executor_test.go
index 5b146a632,fc9f5b36e..ea6e610d8
--- a/lib/crunchrun/executor_test.go
+++ b/lib/crunchrun/executor_test.go
@@@ -6,7 -6,12 +6,11 @@@ package crunchru
import (
"bytes"
+ "fmt"
"io"
- "io/ioutil"
+ "net"
+ "net/http"
+ "os"
"strings"
"time"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list