Update swarming task check to validate Job config (#5182)

`is_swarming_task` should check if the job configuration has
`IS_SWARMING_JOB` in its definition.

---------

Co-authored-by: Diego Jardon <[email protected]>

Author: jardondiego

src/clusterfuzz/_internal/swarming/__init__.py

@@ -14,7 +14,7 @@
 """Swarming helpers."""
 
 import base64
-from json import dumps
+import json
 import uuid
 
 from google.protobuf import json_format
@@ -27,17 +27,8 @@
 from clusterfuzz._internal.system import environment
 
 
-def _requires_gpu() -> bool:
-  """Checks whether the REQUIRES_GPU env variable is set. This means
-  that the current job needs a gpu enabled device."""
-  requires_gpu = environment.get_value('REQUIRES_GPU')
-  return bool(utils.string_is_true(requires_gpu))
-
-
 def _get_instance_spec(swarming_config: local_config.SwarmingConfig,
                        job: data_types.Job) -> dict | None:
-  if not _requires_gpu():
-    return None
   return swarming_config.get('mapping').get(job.platform, None)
 
 
@@ -47,6 +38,11 @@ def is_swarming_task(job_name: str):
   job = data_types.Job.query(data_types.Job.name == job_name).get()
   if job is None:
     return False
+
+  job_environment = job.get_environment()
+  if not utils.string_is_true(job_environment.get('IS_SWARMING_JOB')):
+    return False
+
   return _get_instance_spec(_get_swarming_config(), job) is not None
 
 
@@ -164,7 +160,7 @@ def _env_vars_to_json(
   env_vars_dict = {pair.key: pair.value for pair in env_vars}
   return swarming_pb2.StringPair(  # pylint: disable=no-member
       key='DOCKER_ENV_VARS',
-      value=dumps(env_vars_dict))
+      value=json.dumps(env_vars_dict))
 
 
 def push_swarming_task(task_request: swarming_pb2.NewTaskRequest):  # pylint: disable=no-member

src/clusterfuzz/_internal/tests/core/swarming/swarming_test.py

@@ -33,12 +33,41 @@ def setUp(self):
     helpers.patch(self, [
         'clusterfuzz._internal.base.utils.post_url',
         'clusterfuzz._internal.swarming._get_task_name',
-        'clusterfuzz._internal.swarming._requires_gpu'
     ])
     self.mock._get_task_name.return_value = 'task_name'  # pylint: disable=protected-access
-    self.mock._requires_gpu.return_value = True  # pylint: disable=protected-access
     self.maxDiff = None
 
+  def test_is_swarming_task_true(self):
+    """Tests that is_swarming_task returns True for a swarming job."""
+    job = data_types.Job(
+        name='libfuzzer_chrome_asan',
+        platform='LINUX',
+        environment_string='IS_SWARMING_JOB = True')
+    job.put()
+    self.assertTrue(swarming.is_swarming_task('libfuzzer_chrome_asan'))
+
+  def test_is_swarming_task_false_not_swarming_job(self):
+    """Tests that is_swarming_task returns False if IS_SWARMING_JOB is not True."""
+    job = data_types.Job(
+        name='libfuzzer_chrome_asan',
+        platform='LINUX',
+        environment_string='IS_SWARMING_JOB = False')
+    job.put()
+    self.assertFalse(swarming.is_swarming_task('libfuzzer_chrome_asan'))
+
+  def test_is_swarming_task_false_no_mapping(self):
+    """Tests that is_swarming_task returns False if there is no mapping for the platform."""
+    job = data_types.Job(
+        name='libfuzzer_chrome_asan',
+        platform='UNKNOWN',
+        environment_string='IS_SWARMING_JOB = True')
+    job.put()
+    self.assertFalse(swarming.is_swarming_task('libfuzzer_chrome_asan'))
+
+  def test_is_swarming_task_false_no_job(self):
+    """Tests that is_swarming_task returns False if the job doesn't exist."""
+    self.assertFalse(swarming.is_swarming_task('non_existent_job'))
+
   def test_get_spec_from_config_with_docker_image(self):
     """Tests that _get_new_task_spec works as expected."""
     job = data_types.Job(name='libfuzzer_chrome_asan', platform='LINUX')