X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/678bb65be05eb32aae75de93c33b4ac2a606b7c4..e04c307f011f5ce3b42dff062e1394256f604037:/sdk/python/tests/fed-migrate/fed-migrate.cwlex

diff --git a/sdk/python/tests/fed-migrate/fed-migrate.cwlex b/sdk/python/tests/fed-migrate/fed-migrate.cwlex
index c390938070..4c1db0f43b 100644
--- a/sdk/python/tests/fed-migrate/fed-migrate.cwlex
+++ b/sdk/python/tests/fed-migrate/fed-migrate.cwlex
@@ -6,7 +6,9 @@ def workflow main(
   arvados_cluster_ids string[],
   superuser_tokens string[],
   arvbox_containers string[],
-  fed_migrate="arv-federation-migrate"
+  fed_migrate="arv-federation-migrate",
+  arvbox_bin File,
+  refspec="master"
 ) {
 
   logincluster = run expr (arvados_cluster_ids) string (inputs.arvados_cluster_ids[0])
@@ -14,38 +16,30 @@ def workflow main(
   scatter arvbox_containers as container,
           arvados_cluster_ids as cluster_id,
 	  arvados_api_hosts as host
-    do run workflow(logincluster)
+    do run workflow(logincluster, arvbox_bin, refspec)
   {
-    requirements {
-      EnvVarRequirement {
-        envDef: {
-          ARVBOX_CONTAINER: "$(inputs.container)"
-        }
-      }
-    }
-
-    run tool(container, cluster_id, logincluster, set_login = File("set_login.py")) {
-sh <<<
-set -x
-docker cp $(inputs.container):/var/lib/arvados/cluster_config.yml.override .
-chmod +w cluster_config.yml.override
-python $(inputs.set_login.path) cluster_config.yml.override $(inputs.cluster_id) $(inputs.logincluster)
-docker cp cluster_config.yml.override $(inputs.container):/var/lib/arvados
->>>
-      return container as c
-    }
-    run tool(container, host, c) {
+    run tool(container, host, arvbox_bin, refspec) {
 sh <<<
-set -x
-arvbox hotreset
+set -xe
+export ARVBOX_CONTAINER="$(inputs.container)"
+$(inputs.arvbox_bin.path) pipe <<EOF
+cd /usr/src/arvados
+git fetch
+git checkout -f $(inputs.refspec)
+git pull
+chown arvbox:arvbox -R .
+EOF
+
+$(inputs.arvbox_bin.path) hotreset
+
 while ! curl --fail --insecure --silent https://$(inputs.host)/discovery/v1/apis/arvados/v1/rest >/dev/null ; do sleep 3 ; done
-export ARVADOS_API_HOST=$(inputs.host)
-export ARVADOS_API_TOKEN=\$(arvbox cat /var/lib/arvados/superuser_token)
-export ARVADOS_API_HOST_INSECURE=1
-ARVADOS_VIRTUAL_MACHINE_UUID=\$(arvbox cat /var/lib/arvados/vm-uuid)
-while ! python -c "import arvados ; arvados.api().virtual_machines().get(uuid='$ARVADOS_VIRTUAL_MACHINE_UUID').execute()" 2>/dev/null ; do sleep 3; done
+
+ARVADOS_VIRTUAL_MACHINE_UUID=\$($(inputs.arvbox_bin.path) cat /var/lib/arvados-arvbox/vm-uuid)
+ARVADOS_API_TOKEN=\$($(inputs.arvbox_bin.path) cat /var/lib/arvados-arvbox/superuser_token)
+while ! curl --fail --insecure --silent -H "Authorization: Bearer $ARVADOS_API_TOKEN" https://$(inputs.host)/arvados/v1/virtual_machines/$ARVADOS_VIRTUAL_MACHINE_UUID >/dev/null ; do sleep 3 ; done
+
 >>>
-      return c as d
+      return container as d
     }
     supertok = superuser_tok(container, d)
     return supertok
@@ -53,4 +47,4 @@ while ! python -c "import arvados ; arvados.api().virtual_machines().get(uuid='$
 
   report = run_test(arvados_api_hosts, superuser_tokens=supertok, fed_migrate)
   return supertok, report
-}
\ No newline at end of file
+}