Get rid of system binary support (#4189)

This feature isn't used.

Author: jonathanmetzman

src/clusterfuzz/_internal/build_management/build_manager.py

@@ -285,10 +285,7 @@ def set_env_var(name, value):
         if not absolute_file_path and filename == app_name:
           absolute_file_path = os.path.join(root, filename)
           app_directory = os.path.dirname(absolute_file_path)
-
-          # We don't want to change the state of system binaries.
-          if not environment.get_value('SYSTEM_BINARY_DIR'):
-            os.chmod(absolute_file_path, 0o750)
+          os.chmod(absolute_file_path, 0o750)
 
           set_env_var(app_path, absolute_file_path)
           set_env_var('APP_DIR', app_directory)
@@ -895,27 +892,6 @@ def setup(self):
     return True
 
 
-class SystemBuild(Build):
-  """System binary."""
-
-  def __init__(self, system_binary_directory):
-    super().__init__(None, 1)
-    self._build_dir = system_binary_directory
-
-  @property
-  def build_dir(self):
-    return self._build_dir
-
-  def setup(self):
-    """Set up a build that we assume is already installed on the system."""
-    self._pre_setup()
-    self._setup_application_path()
-    return True
-
-  def delete(self):
-    raise BuildManagerError('Cannot delete system build.')
-
-
 def _sort_build_urls_by_revision(build_urls, bucket_path, reverse):
   """Return a sorted list of build url by revision."""
   base_url = os.path.dirname(bucket_path)
@@ -1315,28 +1291,13 @@ def setup_custom_binary(target_weights=None):
   return None
 
 
-def setup_system_binary():
-  """Set up a build that we assume is already installed on the system."""
-  system_binary_directory = environment.get_value('SYSTEM_BINARY_DIR', '')
-  build = SystemBuild(system_binary_directory)
-  if build.setup():
-    return build
-
-  return None
-
-
 def setup_build(revision=0, target_weights=None):
   """Set up a custom or regular build based on revision."""
   # For custom binaries we always use the latest version. Revision is ignored.
   custom_binary = environment.get_value('CUSTOM_BINARY')
   if custom_binary:
     return setup_custom_binary(target_weights=target_weights)
 
-  # In this case, we assume the build is already installed on the system.
-  system_binary = environment.get_value('SYSTEM_BINARY_DIR')
-  if system_binary:
-    return setup_system_binary()
-
   fuzz_target_build_bucket_path = get_bucket_path(
       'FUZZ_TARGET_BUILD_BUCKET_PATH')
 
@@ -1366,10 +1327,8 @@ def setup_build(revision=0, target_weights=None):
 
 
 def is_custom_binary():
-  """Determine if this is a custom or preinstalled system binary."""
-  return bool(
-      environment.get_value('CUSTOM_BINARY') or
-      environment.get_value('SYSTEM_BINARY_DIR'))
+  """Determine if this is a custom binary."""
+  return bool(environment.get_value('CUSTOM_BINARY'))
 
 
 def has_symbolized_builds():

src/clusterfuzz/_internal/tests/core/build_management/build_manager_test.py

@@ -1101,42 +1101,6 @@ def test_delete(self):
     self.assertTrue(os.path.isdir('/builds/job_custom'))
 
 
-class SystemBuildTest(fake_filesystem_unittest.TestCase):
-  """Tests for system build setup."""
-
-  def setUp(self):
-    """Setup for system build test."""
-    test_utils.set_up_pyfakefs(self)
-
-    test_helpers.patch(self, [
-        'clusterfuzz._internal.system.shell.clear_temp_directory',
-    ])
-
-    test_helpers.patch_environ(self)
-
-    os.environ['BUILDS_DIR'] = '/builds'
-    os.environ['FAIL_RETRIES'] = '1'
-    os.environ['APP_NAME'] = FAKE_APP_NAME
-    os.environ['SYSTEM_BINARY_DIR'] = '/system_binary'
-    _mock_unpack_build(
-        build_manager.SystemBuild('/'), None, '/system_binary', None)
-
-  def test_setup(self):
-    """Test setting up a system binary."""
-    self.assertIsNotNone(build_manager.setup_system_binary())
-
-    self.assertEqual(os.environ['APP_REVISION'], '1')
-    self.assertEqual(os.environ['APP_PATH'], '/system_binary/app')
-    self.assertEqual(os.environ['APP_DIR'], '/system_binary')
-    self.assertEqual(os.environ['BUILD_DIR'], '/system_binary')
-
-  def test_delete(self):
-    """Test deleting this build."""
-    build = build_manager.setup_system_binary()
-    with self.assertRaises(build_manager.BuildManagerError):
-      build.delete()
-
-
 @mock.patch(
     'clusterfuzz._internal.build_management.build_manager.MAX_EVICTED_BUILDS',
     3)