[ARVADOS] updated: 1.3.0-3301-g54e8f7060
Git user
git at public.arvados.org
Mon Oct 12 19:23:38 UTC 2020
Summary of changes:
sdk/cwl/tests/federation/arvboxcwl/fed-config.cwl | 1 +
sdk/python/tests/fed-migrate/README | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
via 54e8f7060b89ff28b316883798ff6080fc3f166d (commit)
from c2565be8a4af26ffe798d9d83d4f4119046f83b4 (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 54e8f7060b89ff28b316883798ff6080fc3f166d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Mon Oct 12 15:23:14 2020 -0400
16989: Don't auto-admin first user in federation migrate test
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/sdk/cwl/tests/federation/arvboxcwl/fed-config.cwl b/sdk/cwl/tests/federation/arvboxcwl/fed-config.cwl
index abd97ed8f..0005b3657 100644
--- a/sdk/cwl/tests/federation/arvboxcwl/fed-config.cwl
+++ b/sdk/cwl/tests/federation/arvboxcwl/fed-config.cwl
@@ -44,6 +44,7 @@ requirements:
r["Clusters"][inputs.this_cluster_id] = {"RemoteClusters": remoteClusters};
if (r["Clusters"][inputs.this_cluster_id]) {
r["Clusters"][inputs.this_cluster_id]["Login"] = {"LoginCluster": inputs.cluster_ids[0]};
+ r["Clusters"][inputs.this_cluster_id]["Users"] = {"AutoAdminFirstUser": false};
}
return JSON.stringify(r);
}
diff --git a/sdk/python/tests/fed-migrate/README b/sdk/python/tests/fed-migrate/README
index 1591b7e17..7b7c473e4 100644
--- a/sdk/python/tests/fed-migrate/README
+++ b/sdk/python/tests/fed-migrate/README
@@ -6,10 +6,10 @@ arv-federation-migrate should be in the path or the full path supplied
in the 'fed_migrate' input parameter.
# Create arvbox containers fedbox(1,2,3) for the federation
-$ cwltool arvbox-make-federation.cwl --arvbox_base ~/.arvbox > fed.json
+$ cwltool --preserve-environment=SSH_AUTH_SOCK arvbox-make-federation.cwl --arvbox_base ~/.arvbox > fed.json
# Configure containers and run tests
-$ cwltool fed-migrate.cwl fed.json
+$ cwltool --preserve-environment=SSH_AUTH_SOCK fed-migrate.cwl fed.json
CWL for running the test is generated using cwl-ex:
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list