Update utask-main-scheduler to use RemoteTaskGate

- Refactor run_bot.py to use RemoteTaskGate instead of GcpBatchService for task scheduling.
- Revert default job frequency to 0% Kubernetes in job_frequency.py.

Signed-off-by: Javan Lacerda <[email protected]>

Author: javanlacerda

src/clusterfuzz/_internal/base/tasks/__init__.py

@@ -87,7 +87,7 @@
 TASK_END_TIME_KEY = 'task_end_time'
 
 POSTPROCESS_QUEUE = 'postprocess'
-UTASK_MAIN_QUEUE = 'test-utask-main'
+UTASK_MAIN_QUEUE = 'utask_main'
 PREPROCESS_QUEUE = 'preprocess'
 
 # See https://github.com/google/clusterfuzz/issues/3347 for usage

src/clusterfuzz/_internal/remote_task/job_frequency.py

@@ -23,7 +23,7 @@
 # By default, all jobs are sent to the GCP Batch backend. This can be
 # overridden on a per-job basis by setting the `K8S_JOBS_FREQUENCY`
 # environment variable.
-DEFAULT_FREQUENCY = {'gcp_batch': 0.5, 'kubernetes': 0.5}
+DEFAULT_FREQUENCY = {'gcp_batch': 1.0, 'kubernetes': 0.0}
 
 
 def _get_job_frequencies_from_env():

src/python/bot/startup/run_bot.py

@@ -17,8 +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
+from clusterfuzz._internal.remote_task import RemoteTaskGate
 
 modules.fix_module_search_paths()
 
@@ -86,9 +86,6 @@ 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."""
 
@@ -105,7 +102,7 @@ def schedule_utask_mains():
         RemoteTask(task.command, task.job, task.argument)
         for task in utask_mains
     ]
-    gcp_batch_service.create_uworker_main_batch_jobs(batch_tasks)
+    RemoteTaskGate().create_uworker_main_batch_jobs(batch_tasks)
 
 
 def task_loop():