Revert "feat(infra): Add base_os_version to support parallel builds"

infra/build/functions/build_lib.py

@@ -685,24 +685,12 @@ def get_gcb_url(build_id, cloud_project='oss-fuzz'):
       f'{build_id}?project={cloud_project}')
 
 
-def get_runner_image_name(test_image_suffix, base_image_tag=None):
-  """Returns the runner image that should be used.
-
-  Returns the testing image if |test_image_suffix|.
-  """
+def get_runner_image_name(test_image_suffix):
+  """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'
-
-  # For trial builds, the version is embedded in the suffix.
   if test_image_suffix:
     image += '-' + test_image_suffix
-    return image
-
-  # For local/manual runs, the version is passed as a tag.
-  # Only add a tag if it's specified and not 'legacy', as 'legacy' implies
-  # 'latest', which is the default behavior.
-  if base_image_tag and base_image_tag != 'legacy':
-    image += ':' + base_image_tag
-
   return image
 
 

infra/build/functions/build_project.py

@@ -73,7 +73,6 @@
 class Config:
   testing: bool = False
   test_image_suffix: Optional[str] = None
-  base_image_tag: Optional[str] = None
   repo: Optional[str] = DEFAULT_OSS_FUZZ_REPO
   branch: Optional[str] = None
   parallel: bool = False
@@ -454,10 +453,8 @@ def get_build_steps_for_project(project,
               f'--architecture {build.architecture} {project.name}\\n' +
               '*' * 80)
           # Test fuzz targets.
-          runner_image_name = build_lib.get_runner_image_name(
-              config.test_image_suffix, config.base_image_tag)
           test_step = {
-              'name': runner_image_name,
+              'name': build_lib.get_runner_image_name(config.test_image_suffix),
               'env': env,
               'args': [
                   'bash', '-c',

infra/build/functions/trial_build.py

@@ -321,7 +321,6 @@ def _do_test_builds(args, test_image_suffix, end_time, version_tag):
 
     config = build_project.Config(testing=True,
                                   test_image_suffix=test_image_suffix,
-                                  base_image_tag=version_tag,
                                   repo=args.repo,
                                   branch=args.branch,
                                   parallel=False,
@@ -433,7 +432,7 @@ def _do_build_type_builds(args, config, credentials, build_type, projects):
           credentials,
           build_type.type_name,
           extra_tags=tags,
-          timeout=PROJECT_BUILD_TIMEOUT))['id']
+          timeout=PROJECT_BUILD_TIMEOUT))
       time.sleep(1)  # Avoid going over 75 requests per second limit.
     except Exception as error:  # pylint: disable=broad-except
       # Handle flake.

infra/build/functions/trial_build_test.py

@@ -73,7 +73,7 @@ def test_build_steps_correct(self, mock_gcb_build_and_push_images,
     del mock_wait_on_builds
     self.maxDiff = None  # pylint: disable=invalid-name
     build_id = 1
-    mock_run_build.return_value = {'id': build_id}
+    mock_run_build.return_value = build_id
     branch_name = 'mybranch'
     project = 'skcms'
     args = [