9766: Full workflow: create workflow using command line, select run from

[arvados.git] / sdk / cwl / arvados_cwl / arvdocker.py

diff --git a/sdk/cwl/arvados_cwl/arvdocker.py b/sdk/cwl/arvados_cwl/arvdocker.py
index 8f76bbf012bfeaf725daf0a007536fdb033bf19b..c75e783ac2de0a0cdf967386983681ff4e5da678 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvdocker.py
+++ b/sdk/cwl/arvados_cwl/arvdocker.py
@@ -1,7 +1,11 @@
 import logging
+import sys
+
 import cwltool.docker
+from cwltool.errors import WorkflowException
 import arvados.commands.keepdocker
 
+
 logger = logging.getLogger('arvados.cwl-runner')
 
 def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid):
@@ -24,8 +28,16 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
         if image_tag:
             args.append(image_tag)
         logger.info("Uploading Docker image %s", ":".join(args[1:]))
-        arvados.commands.keepdocker.main(args, stdout=sys.stderr)
+        try:
+            arvados.commands.keepdocker.main(args, stdout=sys.stderr)
+        except SystemExit:
+            raise WorkflowException()
+
+    images = arvados.commands.keepdocker.list_images_in_arv(api_client, 3,
+                                                            image_name=image_name,
+                                                            image_tag=image_tag)
 
-    # XXX return PDH instead
+    #return dockerRequirement["dockerImageId"]
 
-    return dockerRequirement["dockerImageId"]
+    pdh = api_client.collections().get(uuid=images[0][0]).execute()["portable_data_hash"]
+    return pdh