From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Tue, 29 Mar 2016 17:34:40 +0000 (-0400)
Subject: Merge branch '8815-crunchrunner-everywhere' into 8654-arv-jobs-cwl-runner
X-Git-Tag: 1.1.0~1022^2~10
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/529a648458ceefc02d77abf470a2005a099d9907

Merge branch '8815-crunchrunner-everywhere' into 8654-arv-jobs-cwl-runner

Conflicts:
	sdk/cwl/arvados_cwl/__init__.py
---

529a648458ceefc02d77abf470a2005a099d9907
diff --cc sdk/cwl/arvados_cwl/__init__.py
index 42e0da2e41,e3fd1fccd3..5c7ec4de4e
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@@ -505,39 -393,9 +503,24 @@@ class ArvCwlRunner(object)
          self.uploaded[src] = pair
  
      def arvExecutor(self, tool, job_order, input_basedir, args, **kwargs):
 +        self.debug = args.debug
 +
 +        if args.quiet:
 +            logger.setLevel(logging.WARN)
 +            logging.getLogger('arvados.arv-run').setLevel(logging.WARN)
 +
-         try:
-             self.api.collections().get(uuid=crunchrunner_pdh).execute()
-         except arvados.errors.ApiError as e:
-             import httplib2
-             h = httplib2.Http(ca_certs=arvados.util.ca_certs_path())
-             resp, content = h.request(crunchrunner_download, "GET")
-             resp2, content2 = h.request(certs_download, "GET")
-             with arvados.collection.Collection() as col:
-                 with col.open("crunchrunner", "w") as f:
-                     f.write(content)
-                 with col.open("ca-certificates.crt", "w") as f:
-                     f.write(content2)
- 
-                 col.save_new("crunchrunner binary", ensure_unique_name=True)
- 
 +        useruuid = self.api.users().current().execute()["uuid"]
 +        self.project_uuid = args.project_uuid if args.project_uuid else useruuid
 +        self.pipeline = None
 +
 +        if args.submit:
 +            runnerjob = RunnerJob(self, tool, job_order, args.enable_reuse)
 +            if not args.wait:
 +                runnerjob.run()
 +                return
 +
          events = arvados.events.subscribe(arvados.api('v1'), [["object_uuid", "is_a", "arvados#job"]], self.on_message)
  
 -        self.debug = args.debug
          self.fs_access = CollectionFsAccess(input_basedir)
  
          kwargs["fs_access"] = self.fs_access