Improve batch (#3615)

1. Don't retry tasks.
2. Set longer timeout so variant can complete.

Author: jonathanmetzman

src/clusterfuzz/_internal/bot/tasks/setup.py

@@ -207,6 +207,8 @@ def preprocess_setup_testcase(testcase, fuzzer_override=None, with_deps=True):
   """Preprocessing for setup_testcase function."""
   fuzzer_name = fuzzer_override or testcase.fuzzer_name
   testcase_id = testcase.key.id()
+  if fuzzer_name and not with_deps:
+    logs.log(f'Skipping fuzzer preprocess: {fuzzer_name}.')
   if fuzzer_name and with_deps:
     # This branch is taken when we assume fuzzer needs to be set up for a
     # testcase to be executed (i.e. when a testcase was found by a fuzzer).

src/clusterfuzz/_internal/google_cloud_utils/batch.py

@@ -31,9 +31,8 @@
 
 _local = threading.local()
 
-MAX_DURATION = '3600s'
-RETRY_COUNT = 1
-TASK_COUNT = 1
+MAX_DURATION = f'{int(60 * 60 * 2.5)}s'
+RETRY_COUNT = 0
 
 # Controls how many containers (ClusterFuzz tasks) can run on a single VM.
 # THIS SHOULD BE 1 OR THERE WILL BE SECURITY PROBLEMS.