From 276026f8c9bc619081be3def41ca2eba3c090cb0 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 8 Nov 2018 22:19:15 -0500 Subject: [PATCH] 14198: Refactor arvbox federation setup Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- ...box-fed.cwl => arvbox-make-federation.cwl} | 8 ++-- .../tests/federation/arvbox/arvbox-main.cwl | 38 ------------------- .../{arvbox-fed-config.cwl => fed-config.cwl} | 0 .../arvbox/{arvbox-mkdir.cwl => mkdir.cwl} | 0 .../{arvbox-setup-user.cwl => setup-user.cwl} | 0 .../{framework => arvbox}/setup_user.py | 0 .../arvbox/{arvbox-start.cwl => start.cwl} | 0 .../arvbox/{arvbox-stop.cwl => stop.cwl} | 0 8 files changed, 4 insertions(+), 42 deletions(-) rename sdk/cwl/tests/federation/{arvbox/arvbox-fed.cwl => arvbox-make-federation.cwl} (94%) delete mode 100644 sdk/cwl/tests/federation/arvbox/arvbox-main.cwl rename sdk/cwl/tests/federation/arvbox/{arvbox-fed-config.cwl => fed-config.cwl} (100%) rename sdk/cwl/tests/federation/arvbox/{arvbox-mkdir.cwl => mkdir.cwl} (100%) rename sdk/cwl/tests/federation/arvbox/{arvbox-setup-user.cwl => setup-user.cwl} (100%) rename sdk/cwl/tests/federation/{framework => arvbox}/setup_user.py (100%) rename sdk/cwl/tests/federation/arvbox/{arvbox-start.cwl => start.cwl} (100%) rename sdk/cwl/tests/federation/arvbox/{arvbox-stop.cwl => stop.cwl} (100%) diff --git a/sdk/cwl/tests/federation/arvbox/arvbox-fed.cwl b/sdk/cwl/tests/federation/arvbox-make-federation.cwl similarity index 94% rename from sdk/cwl/tests/federation/arvbox/arvbox-fed.cwl rename to sdk/cwl/tests/federation/arvbox-make-federation.cwl index 91e6220220..9a08195a7a 100644 --- a/sdk/cwl/tests/federation/arvbox/arvbox-fed.cwl +++ b/sdk/cwl/tests/federation/arvbox-make-federation.cwl @@ -44,7 +44,7 @@ steps: containers: containers arvbox_base: arvbox_base out: [arvbox_data] - run: arvbox-mkdir.cwl + run: arvbox/mkdir.cwl start: in: container_name: containers @@ -52,7 +52,7 @@ steps: out: [cluster_id, container_host, arvbox_data_out, superuser_token] scatter: [container_name, arvbox_data] scatterMethod: dotproduct - run: arvbox-start.cwl + run: arvbox/start.cwl fed-config: in: container_name: containers @@ -63,10 +63,10 @@ steps: out: [] scatter: [container_name, this_cluster_id, arvbox_data] scatterMethod: dotproduct - run: arvbox-fed-config.cwl + run: arvbox/fed-config.cwl setup-user: in: container_host: {source: start/container_host, valueFrom: "$(self[0])"} superuser_token: {source: start/superuser_token, valueFrom: "$(self[0])"} out: [test_user_uuid, test_user_token] - run: arvbox-setup-user.cwl + run: arvbox/setup-user.cwl diff --git a/sdk/cwl/tests/federation/arvbox/arvbox-main.cwl b/sdk/cwl/tests/federation/arvbox/arvbox-main.cwl deleted file mode 100644 index a6fd008237..0000000000 --- a/sdk/cwl/tests/federation/arvbox/arvbox-main.cwl +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) The Arvados Authors. All rights reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -cwlVersion: v1.0 -class: Workflow -$namespaces: - arv: "http://arvados.org/cwl#" - cwltool: "http://commonwl.org/cwltool#" -requirements: - cwltool:LoadListingRequirement: - loadListing: no_listing - SubworkflowFeatureRequirement: {} -inputs: - arvbox_base: Directory - acr: string? -outputs: [] -steps: - run-arvbox: - in: - containers: - default: [fedbox1, fedbox2, fedbox3] - arvbox_base: arvbox_base - out: [cluster_ids, container_hosts, test_user_uuid, test_user_token] - run: arvbox-fed.cwl - run-main: - in: - arvados_api_host_home: {source: run-arvbox/container_hosts, valueFrom: "$(self[0])"} - arvados_home_id: {source: run-arvbox/cluster_ids, valueFrom: "$(self[0])"} - arvados_api_token: run-arvbox/test_user_token - arvado_api_host_insecure: {default: true} - arvados_api_host_clusterB: {source: run-arvbox/container_hosts, valueFrom: "$(self[1])"} - arvados_clusterB_id: {source: run-arvbox/cluster_ids, valueFrom: "$(self[1])"} - arvados_api_host_clusterC: {source: run-arvbox/container_hosts, valueFrom: "$(self[2])"} - arvados_clusterC_id: {source: run-arvbox/cluster_ids, valueFrom: "$(self[2])"} - acr: acr - out: [base-case-out, runner-home-step-remote-out] - run: main.cwl diff --git a/sdk/cwl/tests/federation/arvbox/arvbox-fed-config.cwl b/sdk/cwl/tests/federation/arvbox/fed-config.cwl similarity index 100% rename from sdk/cwl/tests/federation/arvbox/arvbox-fed-config.cwl rename to sdk/cwl/tests/federation/arvbox/fed-config.cwl diff --git a/sdk/cwl/tests/federation/arvbox/arvbox-mkdir.cwl b/sdk/cwl/tests/federation/arvbox/mkdir.cwl similarity index 100% rename from sdk/cwl/tests/federation/arvbox/arvbox-mkdir.cwl rename to sdk/cwl/tests/federation/arvbox/mkdir.cwl diff --git a/sdk/cwl/tests/federation/arvbox/arvbox-setup-user.cwl b/sdk/cwl/tests/federation/arvbox/setup-user.cwl similarity index 100% rename from sdk/cwl/tests/federation/arvbox/arvbox-setup-user.cwl rename to sdk/cwl/tests/federation/arvbox/setup-user.cwl diff --git a/sdk/cwl/tests/federation/framework/setup_user.py b/sdk/cwl/tests/federation/arvbox/setup_user.py similarity index 100% rename from sdk/cwl/tests/federation/framework/setup_user.py rename to sdk/cwl/tests/federation/arvbox/setup_user.py diff --git a/sdk/cwl/tests/federation/arvbox/arvbox-start.cwl b/sdk/cwl/tests/federation/arvbox/start.cwl similarity index 100% rename from sdk/cwl/tests/federation/arvbox/arvbox-start.cwl rename to sdk/cwl/tests/federation/arvbox/start.cwl diff --git a/sdk/cwl/tests/federation/arvbox/arvbox-stop.cwl b/sdk/cwl/tests/federation/arvbox/stop.cwl similarity index 100% rename from sdk/cwl/tests/federation/arvbox/arvbox-stop.cwl rename to sdk/cwl/tests/federation/arvbox/stop.cwl -- 2.39.5