[CIFuzz] Don't make everything a subdirectory of /out (#5970)

Use different subdirectories of workspace for builds, old builds, coverage reports, corpora and artifacts/testscases.

1 files changed, 17 insertions, 16 deletions

diff --git a/infra/cifuzz/build_fuzzers.py b/infra/cifuzz/build_fuzzers.py
index 4254067d3..763659749 100644
--- a/infra/cifuzz/build_fuzzers.py
+++ b/infra/cifuzz/build_fuzzers.py
@@ -50,10 +50,9 @@ class Builder:  # pylint: disable=too-many-instance-attributes
   def __init__(self, config, ci_system):
     self.config = config
     self.ci_system = ci_system
-    self.out_dir = os.path.join(config.workspace, 'out')
-    os.makedirs(self.out_dir, exist_ok=True)
-    self.work_dir = os.path.join(config.workspace, 'work')
-    os.makedirs(self.work_dir, exist_ok=True)
+    self.workspace = docker.Workspace(config)
+    self.workspace.initialize_dir(self.workspace.out)
+    self.workspace.initialize_dir(self.workspace.work)
     self.image_repo_path = None
     self.host_repo_path = None
     self.repo_manager = None
@@ -75,13 +74,14 @@ class Builder:  # pylint: disable=too-many-instance-attributes
     """Moves the source code we want to fuzz into the project builder and builds
     the fuzzers from that source code. Returns True on success."""
     docker_args, docker_container = docker.get_base_docker_run_args(
-        self.out_dir, self.config.sanitizer, self.config.language)
+        self.workspace, self.config.sanitizer, self.config.language)
     if not docker_container:
       docker_args.extend(
           _get_docker_build_fuzzers_args_not_container(self.host_repo_path))
 
     if self.config.sanitizer == 'memory':
-      docker_args.extend(_get_docker_build_fuzzers_args_msan(self.work_dir))
+      docker_args.extend(
+          _get_docker_build_fuzzers_args_msan(self.workspace.work))
       self.handle_msan_prebuild(docker_container)
 
     docker_args.extend([
@@ -111,7 +111,7 @@ class Builder:  # pylint: disable=too-many-instance-attributes
     """Post-build step for MSAN builds. Patches the build to use MSAN
     libraries."""
     helper.docker_run([
-        '--volumes-from', container, '-e', f'WORK={self.work_dir}',
+        '--volumes-from', container, '-e', f'WORK={self.workspace.work}',
         docker.MSAN_LIBS_BUILDER_TAG, 'patch_build.py', '/out'
     ])
 
@@ -121,7 +121,7 @@ class Builder:  # pylint: disable=too-many-instance-attributes
     logging.info('Copying MSAN libs.')
     helper.docker_run([
         '--volumes-from', container, docker.MSAN_LIBS_BUILDER_TAG, 'bash', '-c',
-        f'cp -r /msan {self.work_dir}'
+        f'cp -r /msan {self.workspace.work}'
     ])
 
   def build(self):
@@ -146,7 +146,7 @@ class Builder:  # pylint: disable=too-many-instance-attributes
     changed_files = self.ci_system.get_changed_code_under_test(
         self.repo_manager)
     affected_fuzz_targets.remove_unaffected_fuzz_targets(
-        self.config.project_name, self.out_dir, changed_files,
+        self.config.project_name, self.workspace.out, changed_files,
         self.image_repo_path)
     return True
 
@@ -178,7 +178,7 @@ def build_fuzzers(config):
   return builder.build()
 
 
-def check_fuzzer_build(out_dir,
+def check_fuzzer_build(workspace,
                        sanitizer,
                        language,
                        allowed_broken_targets_percentage=None):
@@ -191,14 +191,15 @@ def check_fuzzer_build(out_dir,
   Returns:
     True if fuzzers are correct.
   """
-  if not os.path.exists(out_dir):
-    logging.error('Invalid out directory: %s.', out_dir)
+  if not os.path.exists(workspace.out):
+    logging.error('Invalid out directory: %s.', workspace.out)
     return False
-  if not os.listdir(out_dir):
-    logging.error('No fuzzers found in out directory: %s.', out_dir)
+  if not os.listdir(workspace.out):
+    logging.error('No fuzzers found in out directory: %s.', workspace.out)
     return False
 
-  docker_args, _ = docker.get_base_docker_run_args(out_dir, sanitizer, language)
+  docker_args, _ = docker.get_base_docker_run_args(workspace, sanitizer,
+                                                   language)
   if allowed_broken_targets_percentage is not None:
     docker_args += [
         '-e',
@@ -216,7 +217,7 @@ def check_fuzzer_build(out_dir,
 
 def _get_docker_build_fuzzers_args_not_container(host_repo_path):
   """Returns arguments to the docker build arguments that are needed to use
-  |host_out_dir| when the host of the OSS-Fuzz builder container is not
+  |host_repo_path| when the host of the OSS-Fuzz builder container is not
   another container."""
   return ['-v', f'{host_repo_path}:{host_repo_path}']