Add a switch for generating .tgz snapshots

PiperOrigin-RevId: 777002237

Author: OSS-Fuzz Team

infra/base-images/base-builder/indexer/index_build.py

@@ -440,7 +440,7 @@ def copy_shared_libraries(
       raise e
 
 
-def archive_target(target: BinaryMetadata) -> Path | None:
+def archive_target(target: BinaryMetadata, file_extension: str) -> Path | None:
   """Archives a single target in the project using the exported rootfs."""
   logging.info('archive_target %s', target.name)
   index_dir = INDEXES_PATH / target.build_id
@@ -474,7 +474,7 @@ def archive_target(target: BinaryMetadata) -> Path | None:
 
     set_interpreter(target_path, lib_mount_path)
     set_target_rpath(target_path, lib_mount_path)
-    archive_path = SNAPSHOT_DIR / f'{uuid}.tar'
+    archive_path = SNAPSHOT_DIR / f'{uuid}{file_extension}'
     # For `/` in $PROJECT.
     archive_path.parent.mkdir(parents=True, exist_ok=True)
 
@@ -511,6 +511,7 @@ def test_and_archive(
     target_args: list[str],
     target_env: dict[str, str],
     targets_to_index: Sequence[str] | None,
+    file_extension: str,
 ):
   """Test target and archive."""
   targets = enumerate_build_targets(target_args, target_env)
@@ -532,7 +533,7 @@ def test_and_archive(
     except Exception:  # pylint: disable=broad-exception-caught
       logging.exception('Error testing target.')
       continue
-    archive_target(target)
+    archive_target(target, file_extension)
 
 
 def clear_out():
@@ -598,6 +599,11 @@ def main():
       action='append',
       help='An argument to pass to the `compile` script.',
   )
+  parser.add_argument(
+      '--compressed',
+      action='store_true',
+      help='Use gzipped tar (.tgz) for the output snapshot',
+  )
   args = parser.parse_args()
 
   # Clean up the existing OUT by default, otherwise we may run into various
@@ -639,7 +645,8 @@ def main():
     logging.info('No target env specified.')
     target_env = {}
 
-  test_and_archive(target_args, target_env, targets_to_index)
+  file_extension = '.tgz' if args.compressed else '.tar'
+  test_and_archive(target_args, target_env, targets_to_index, file_extension)
 
   for snapshot in SNAPSHOT_DIR.iterdir():
     shutil.move(str(snapshot), OUT)

infra/base-images/base-builder/indexer/index_build_test.py

@@ -36,7 +36,7 @@
 class IndexBuildTest(unittest.TestCase):
 
   def _build_project(
-      self, project: str, *additional_args
+      self, project: str, *additional_args, compressed: bool
   ) -> Sequence[pathlib.Path]:
     subprocess.run(
         ('python3', 'infra/helper.py', 'build_image', '--no-pull', project),
@@ -62,11 +62,16 @@ def _build_project(
     if additional_args:
       docker_args.extend(additional_args)
 
+    file_suffix = '.tar'
+    if compressed:
+      docker_args.append('--compressed')
+      file_suffix = '.tgz'
+
     subprocess.run(docker_args, cwd=OSS_FUZZ_DIR, check=True)
     return [
         file
         for file in out_dir.iterdir()
-        if file.suffix == '.tar' and file.name.startswith(project)
+        if file.suffix == file_suffix and file.name.startswith(project)
     ]
 
   def _check_archive(self, archive_path: pathlib.Path):
@@ -113,17 +118,22 @@ def _check_archive(self, archive_path: pathlib.Path):
 
   def test_basic_build(self):
     """Test basic build."""
-    archives = self._build_project('expat')
-    self.assertGreater(len(archives), 0)
-    for archive in archives:
-      self._check_archive(archive)
+    for compressed in (False, True):
+      archives = self._build_project('expat', compressed=compressed)
+      self.assertGreater(len(archives), 0)
+      for archive in archives:
+        self._check_archive(archive)
 
   def test_build_with_target_allowlist(self):
     """Test basic build with target allowlist."""
-    archives = self._build_project(
-        'expat', '--targets', 'xml_parse_fuzzer_UTF-8'
-    )
-    self.assertEqual(len(archives), 1)
-    self.assertIn('xml_parse_fuzzer_UTF-8', archives[0].name)
-    for archive in archives:
-      self._check_archive(archive)
+    for compressed in (False, True):
+      archives = self._build_project(
+          'expat',
+          '--targets',
+          'xml_parse_fuzzer_UTF-8',
+          compressed=compressed,
+      )
+      self.assertEqual(len(archives), 1)
+      self.assertIn('xml_parse_fuzzer_UTF-8', archives[0].name)
+      for archive in archives:
+        self._check_archive(archive)