14198: Set ClusterTarget hint on steps instead of tools

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/sdk/cwl/tests/federation/cases/base-case.cwl b/sdk/cwl/tests/federation/cases/base-case.cwl
index 57eff597542fc3432bcf17ac61eb4c29da5b58ed..4ab3b209676ab312ab26f67c97dc2b7a01526751 100644 (file)
--- a/sdk/cwl/tests/federation/cases/base-case.cwl
+++ b/sdk/cwl/tests/federation/cases/base-case.cwl
@@ -25,4 +25,7 @@ steps:
       inp: inp
       runOnCluster: runOnCluster
     out: [hash]
-    run: md5sum.cwl
\ No newline at end of file
+    hints:
+      arv:ClusterTarget:
+        cluster_id: $(inputs.runOnCluster)
+    run: md5sum.cwl

diff --git a/sdk/cwl/tests/federation/cases/md5sum.cwl b/sdk/cwl/tests/federation/cases/md5sum.cwl
index 8a844e9dd7b8505ba39dc6fdf3b80068adc0d5fa..af119990a3104474f1094bc836a10b5f64d204ab 100644 (file)
--- a/sdk/cwl/tests/federation/cases/md5sum.cwl
+++ b/sdk/cwl/tests/federation/cases/md5sum.cwl
@@ -8,12 +8,9 @@ $namespaces:
   arv: "http://arvados.org/cwl#"
 requirements:
   InlineJavascriptRequirement: {}
-  arv:ClusterTarget:
-    cluster_id: $(inputs.runOnCluster)
 inputs:
   inp:
     type: File
-  runOnCluster: string
 outputs:
   hash:
     type: File

diff --git a/sdk/cwl/tests/federation/cases/remote-case.cwl b/sdk/cwl/tests/federation/cases/remote-case.cwl
index 02d1e953a9dc76cdffc5e1ad3398fba309b3536c..66830620f17d1e272dc2912b203536cdb23586b3 100644 (file)
--- a/sdk/cwl/tests/federation/cases/remote-case.cwl
+++ b/sdk/cwl/tests/federation/cases/remote-case.cwl
@@ -25,4 +25,7 @@ steps:
       inp: inp
       runOnCluster: runOnCluster
     out: [hash]
-    run: md5sum.cwl
\ No newline at end of file
+    hints:
+      arv:ClusterTarget:
+        cluster_id: $(inputs.runOnCluster)
+    run: md5sum.cwl

diff --git a/sdk/cwl/tests/federation/cases/rev-input-to-output.cwl b/sdk/cwl/tests/federation/cases/rev-input-to-output.cwl
index ac9f4e915f42f37817eb549579bff40de5497362..0c247a8586d5590a7bfbf6f66286196f51c96722 100644 (file)
--- a/sdk/cwl/tests/federation/cases/rev-input-to-output.cwl
+++ b/sdk/cwl/tests/federation/cases/rev-input-to-output.cwl
@@ -8,13 +8,10 @@ $namespaces:
   arv: "http://arvados.org/cwl#"
 requirements:
   InlineJavascriptRequirement: {}
-  arv:ClusterTarget:
-    cluster_id: $(inputs.runOnCluster)
   ShellCommandRequirement: {}
 inputs:
   inp:
     type: File
-  runOnCluster: string
 outputs:
   original:
     type: File

diff --git a/sdk/cwl/tests/federation/cases/rev.cwl b/sdk/cwl/tests/federation/cases/rev.cwl
index 13e7a87f222a669600aeafc6c05ad80a72a4359d..8bbc565d9f94b0b8d78292525315641362837ea9 100644 (file)
--- a/sdk/cwl/tests/federation/cases/rev.cwl
+++ b/sdk/cwl/tests/federation/cases/rev.cwl
@@ -8,12 +8,9 @@ $namespaces:
   arv: "http://arvados.org/cwl#"
 requirements:
   InlineJavascriptRequirement: {}
-  arv:ClusterTarget:
-    cluster_id: $(inputs.runOnCluster)
 inputs:
   inp:
     type: File
-  runOnCluster: string
 outputs:
   revhash:
     type: File