[ARVADOS] updated: 1.3.0-3264-gde961f415

[Git user]

Summary of changes:
 .licenseignore                                 | 3 +++
 sdk/python/tests/fed-migrate/fed-migrate.cwl   | 6 +++---
 sdk/python/tests/fed-migrate/superuser-tok.cwl | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

       via  de961f4152f551692ac8a8b4392f971496273844 (commit)
      from  da8b6f7d9582d0829e1318f7f914730a47112e7a (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 de961f4152f551692ac8a8b4392f971496273844
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Oct 6 11:55:41 2020 -0400

    Fix arv-federation-migrate-test jenkins job: update hardcoded arvbox
    container paths.
    
    refs #16267
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/.licenseignore b/.licenseignore
index 81f6b7181..490c8447c 100644
--- a/.licenseignore
+++ b/.licenseignore
@@ -82,3 +82,6 @@ sdk/java-v2/settings.gradle
 sdk/cwl/tests/wf/feddemo
 go.mod
 go.sum
+sdk/python/tests/fed-migrate/CWLFile
+sdk/python/tests/fed-migrate/*.cwl
+sdk/python/tests/fed-migrate/*.cwlex
diff --git a/sdk/python/tests/fed-migrate/fed-migrate.cwl b/sdk/python/tests/fed-migrate/fed-migrate.cwl
index 19c2b58ef..bb11f0a6e 100644
--- a/sdk/python/tests/fed-migrate/fed-migrate.cwl
+++ b/sdk/python/tests/fed-migrate/fed-migrate.cwl
@@ -293,7 +293,7 @@ $graph:
   - arguments:
       - arvbox
       - cat
-      - /var/lib/arvados/superuser_token
+      - /var/lib/arvados-arvbox/superuser_token
     class: CommandLineTool
     cwlVersion: v1.0
     id: '#superuser_tok'
@@ -476,10 +476,10 @@ $graph:
 
 
                           ARVADOS_VIRTUAL_MACHINE_UUID=\$($(inputs.arvbox_bin.path)
-                          cat /var/lib/arvados/vm-uuid)
+                          cat /var/lib/arvados-arvbox/vm-uuid)
 
                           ARVADOS_API_TOKEN=\$($(inputs.arvbox_bin.path) cat
-                          /var/lib/arvados/superuser_token)
+                          /var/lib/arvados-arvbox/superuser_token)
 
                           while ! curl --fail --insecure --silent -H
                           "Authorization: Bearer $ARVADOS_API_TOKEN"
diff --git a/sdk/python/tests/fed-migrate/superuser-tok.cwl b/sdk/python/tests/fed-migrate/superuser-tok.cwl
index d2ce253a9..e2ad5db5d 100755
--- a/sdk/python/tests/fed-migrate/superuser-tok.cwl
+++ b/sdk/python/tests/fed-migrate/superuser-tok.cwl
@@ -16,4 +16,4 @@ requirements:
     envDef:
       ARVBOX_CONTAINER: "$(inputs.container)"
   InlineJavascriptRequirement: {}
-arguments: [arvbox, cat, /var/lib/arvados/superuser_token]
+arguments: [arvbox, cat, /var/lib/arvados-arvbox/superuser_token]

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


hooks/post-receive
--