cache_name -> cache_image

Signed-off-by: David Korczynski <[email protected]>

Author: DavidKorczynski

infra/build/functions/build_lib.py

@@ -388,7 +388,7 @@ def get_docker_build_step(image_names,
                           use_buildkit_cache=False,
                           src_root='oss-fuzz',
                           architecture='x86_64',
-                          cache_name=''):
+                          cache_image=''):
   """Returns the docker build step."""
   assert len(image_names) >= 1
   directory = os.path.join(src_root, directory)
@@ -405,7 +405,7 @@ def get_docker_build_step(image_names,
         _make_image_name_architecture_specific(image_name, architecture)
         for image_name in image_names
     ]
-  if cache_name:
+  if cache_image:
     args.extend(['--build-arg', f'CACHE_IMAGE={cache_name}'])
 
   for image_name in image_names:
@@ -442,7 +442,7 @@ def get_project_image_steps(  # pylint: disable=too-many-arguments
     config,
     architectures=None,
     experiment=False,
-    cache_name=''):
+    cache_image=''):
   """Returns GCB steps to build OSS-Fuzz project image."""
   if architectures is None:
     architectures = []
@@ -462,7 +462,7 @@ def get_project_image_steps(  # pylint: disable=too-many-arguments
   docker_build_step = get_docker_build_step([image],
                                             os.path.join('projects', name),
                                             src_root=src_root,
-                                            cache_name=cache_name)
+                                            cache_image=cache_image)
   steps.append(docker_build_step)
   srcmap_step_id = get_srcmap_step_id()
   steps.extend([{

infra/build/functions/build_project.py

@@ -358,18 +358,18 @@ def get_build_steps_for_project(project,
   # if we use caching, then we need to use the right name. We assume that
   # there is only a single sanitizer.
   if use_caching:
-    cache_name = ('us-central1-docker.pkg.dev/oss-fuzz/oss-fuzz-gen/'
-                  f'{project.name}-ofg-cached-{project.sanitizers[0]}')
+    cache_image = ('us-central1-docker.pkg.dev/oss-fuzz/oss-fuzz-gen/'
+                   f'{project.name}-ofg-cached-{project.sanitizers[0]}')
   else:
-    cache_name = ''
+    cache_image = ''
   build_steps = build_lib.get_project_image_steps(
       project.name,
       project.image,
       project.fuzzing_language,
       config=config,
       architectures=project.architectures,
       experiment=config.experiment,
-      cache_name=cache_name)
+      cache_image=cache_image)
 
   # Sort engines to make AFL first to test if libFuzzer has an advantage in
   # finding bugs first since it is generally built first.