From 0672aa4e1f2cc332f6e6a020259c35007292cd91 Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Wed, 30 Jun 2021 07:34:42 -0700
Subject: [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.
---
 infra/cifuzz/build_fuzzers_entrypoint.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'infra/cifuzz/build_fuzzers_entrypoint.py')

diff --git a/infra/cifuzz/build_fuzzers_entrypoint.py b/infra/cifuzz/build_fuzzers_entrypoint.py
index 04f562068..2ab7aa361 100644
--- a/infra/cifuzz/build_fuzzers_entrypoint.py
+++ b/infra/cifuzz/build_fuzzers_entrypoint.py
@@ -13,11 +13,11 @@
 # limitations under the License.
 """Builds a specific OSS-Fuzz project's fuzzers for CI tools."""
 import logging
-import os
 import sys
 
 import build_fuzzers
 import config_utils
+import docker
 
 # pylint: disable=c-extension-no-member
 # pylint gets confused because of the relative import of cifuzz.
@@ -71,15 +71,13 @@ def main():
         config.project_name, config.commit_sha, config.pr_ref)
     return returncode
 
-  out_dir = os.path.join(config.workspace, 'out')
-
   if not config.bad_build_check:
     # If we've gotten to this point and we don't need to do bad_build_check,
     # then the build has succeeded.
     returncode = 0
   # yapf: disable
   elif build_fuzzers.check_fuzzer_build(
-      out_dir,
+      docker.Workspace(config),
       config.sanitizer,
       config.language,
       allowed_broken_targets_percentage=config.allowed_broken_targets_percentage
-- 
cgit v1.2.3