From c66a9d2b530ee8190761ba98689abb39e4ee98ac Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Wed, 15 Sep 2021 13:29:52 -0700
Subject: [PATCH] [helper] Use base-runner to check if fuzzer exists. (#6453)

Fixes: https://github.com/google/oss-fuzz/issues/6452
---
 infra/helper.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/infra/helper.py b/infra/helper.py
index f9b86a6bf..a47c822a2 100755
--- a/infra/helper.py
+++ b/infra/helper.py
@@ -35,6 +35,8 @@ import constants
 OSS_FUZZ_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 BUILD_DIR = os.path.join(OSS_FUZZ_DIR, 'build')
 
+BASE_RUNNER_IMAGE = 'gcr.io/oss-fuzz-base/base-runner'
+
 BASE_IMAGES = [
     'gcr.io/oss-fuzz-base/base-image',
     'gcr.io/oss-fuzz-base/base-clang',
@@ -44,7 +46,7 @@ BASE_IMAGES = [
     'gcr.io/oss-fuzz-base/base-builder-python',
     'gcr.io/oss-fuzz-base/base-builder-rust',
     'gcr.io/oss-fuzz-base/base-builder-swift',
-    'gcr.io/oss-fuzz-base/base-runner',
+    BASE_RUNNER_IMAGE,
     'gcr.io/oss-fuzz-base/base-runner-debug',
 ]
 
@@ -377,7 +379,7 @@ def _check_fuzzer_exists(project, fuzzer_name):
   """Checks if a fuzzer exists."""
   command = ['docker', 'run', '--rm']
   command.extend(['-v', '%s:/out' % project.out])
-  command.append('ubuntu:16.04')
+  command.append(BASE_RUNNER_IMAGE)
 
   command.extend(['/bin/bash', '-c', 'test -f /out/%s' % fuzzer_name])
 
@@ -714,8 +716,7 @@ def check_build(args):
     env += args.e
 
   run_args = _env_to_docker_args(env) + [
-      '-v',
-      '%s:/out' % args.project.out, '-t', 'gcr.io/oss-fuzz-base/base-runner'
+      '-v', '%s:/out' % args.project.out, '-t', BASE_RUNNER_IMAGE
   ]
 
   if args.fuzzer_name:
@@ -880,7 +881,7 @@ def coverage(args):
       '-v',
       '%s:/out' % args.project.out,
       '-t',
-      'gcr.io/oss-fuzz-base/base-runner',
+      BASE_RUNNER_IMAGE,
   ])
 
   run_args.append('coverage')
@@ -930,7 +931,7 @@ def run_fuzzer(args):
       '-v',
       '%s:/out' % args.project.out,
       '-t',
-      'gcr.io/oss-fuzz-base/base-runner',
+      BASE_RUNNER_IMAGE,
       'run_fuzzer',
       args.fuzzer_name,
   ] + args.fuzzer_args)