Update run_remote_task.py and run_bot.py to use new RemoteTask and GcpBatchService

Author: javanlacerda

src/local/butler/scripts/run_remote_task.py

@@ -16,7 +16,9 @@
 import contextlib
 
 from clusterfuzz._internal.base import tasks
+from clusterfuzz._internal.batch.service import GcpBatchService
 from clusterfuzz._internal.metrics import monitoring_metrics
+from clusterfuzz._internal.remote_task import RemoteTask
 from clusterfuzz._internal.system import environment
 
 
@@ -35,7 +37,6 @@ def lease_all_tasks(task_list):
 
 def schedule_utask_mains():
   """Schedules utask_mains from preprocessed utasks on Google Cloud Batch."""
-  from clusterfuzz._internal.google_cloud_utils import batch
 
   print('Attempting to combine batch tasks.')
   utask_mains = tasks.get_utask_mains()
@@ -47,10 +48,10 @@ def schedule_utask_mains():
 
   with lease_all_tasks(utask_mains):
     batch_tasks = [
-        batch.RemoteTask(task.command, task.job, task.argument)
+        RemoteTask(task.command, task.job, task.argument)
         for task in utask_mains
     ]
-    return batch.create_uworker_main_batch_jobs(batch_tasks)
+    return GcpBatchService().create_uworker_main_batch_jobs(batch_tasks)
 
 
 def execute(*args, **kwargs):  # pylint: disable=unused-argument

src/python/bot/startup/run_bot.py

@@ -17,6 +17,8 @@
 # to be able to import dependencies directly, but we must store these in
 # subdirectories of common so that they are shared with App Engine.
 from clusterfuzz._internal.base import modules
+from clusterfuzz._internal.batch.service import GcpBatchService
+from clusterfuzz._internal.remote_task import RemoteTask
 
 modules.fix_module_search_paths()
 
@@ -84,9 +86,11 @@ def lease_all_tasks(task_list):
     yield
 
 
+gcp_batch_service = GcpBatchService()
+
+
 def schedule_utask_mains():
   """Schedules utask_mains from preprocessed utasks on Google Cloud Batch."""
-  from clusterfuzz._internal.google_cloud_utils import batch
 
   logs.info('Attempting to combine batch tasks.')
   utask_mains = tasks.get_utask_mains()
@@ -98,10 +102,10 @@ def schedule_utask_mains():
 
   with lease_all_tasks(utask_mains):
     batch_tasks = [
-        batch.RemoteTask(task.command, task.job, task.argument)
+        RemoteTask(task.command, task.job, task.argument)
         for task in utask_mains
     ]
-    batch.create_uworker_main_batch_jobs(batch_tasks)
+    gcp_batch_service.create_uworker_main_batch_jobs(batch_tasks)
 
 
 def task_loop():