feat(build): Add version tag support to runner image and update project build steps

Author: hunsche

infra/build/functions/build_lib.py

@@ -677,12 +677,15 @@ def get_gcb_url(build_id, cloud_project='oss-fuzz'):
       f'{build_id}?project={cloud_project}')
 
 
-def get_runner_image_name(test_image_suffix):
+def get_runner_image_name(test_image_suffix, version_tag=None):
   """Returns the runner image that should be used. Returns the testing image if
   |test_image_suffix|."""
   image = f'gcr.io/{BASE_IMAGES_PROJECT}/base-runner'
   if test_image_suffix:
     image += '-' + test_image_suffix
+  
+  if version_tag:
+    image += ':' + version_tag
   return image
 
 

infra/build/functions/build_project.py

@@ -83,6 +83,7 @@ class Config:
   build_type: Optional[str] = None
   fuzzing_engine: Optional[str] = None
   fuzz_target: Optional[str] = None
+  version_tag: Optional[str] = None
 
 
 # Allow the WORKDIR to be commented out for OSS-Fuzz-Gen, which creates new
@@ -457,7 +458,7 @@ def get_build_steps_for_project(project,
               '*' * 80)
           # Test fuzz targets.
           test_step = {
-              'name': build_lib.get_runner_image_name(config.test_image_suffix),
+              'name': build_lib.get_runner_image_name(config.test_image_suffix, config.version_tag),
               'env': env,
               'args': [
                   'bash', '-c',
@@ -488,7 +489,7 @@ def get_build_steps_for_project(project,
             # Generate targets list.
             {
                 'name':
-                    build_lib.get_runner_image_name(config.test_image_suffix),
+                    build_lib.get_runner_image_name(config.test_image_suffix, config.version_tag),
                 'env':
                     env,
                 'args': [
@@ -829,7 +830,8 @@ def create_config(args, build_type):
                 experiment=args.experiment,
                 build_type=build_type,
                 fuzzing_engine=args.fuzzing_engine,
-                fuzz_target=args.fuzz_target)
+                fuzz_target=args.fuzz_target,
+                version_tag=getattr(args, 'version_tag', None))
 
 
 def build_script_main(script_description,