feat(build): Add new base images and enhance trial build process

Author: hunsche

infra/build/functions/build_and_push_test_images.py

@@ -284,6 +284,8 @@ def build_and_push_images(test_image_tag, version_tag=None):
   images = [
       ['base-image'],
       ['base-clang'],
+      ['base-clang-full'],
+      ['indexer'],
       ['base-builder'],
       [
           'base-builder-swift',

infra/build/functions/build_lib.py

@@ -456,7 +456,6 @@ def get_pull_test_images_steps(test_image_suffix):
       'gcr.io/oss-fuzz-base/base-builder-python',
       'gcr.io/oss-fuzz-base/base-builder-ruby',
       'gcr.io/oss-fuzz-base/base-builder-rust',
-      'gcr.io/oss-fuzz-base/base-builder-ruby',
       'gcr.io/oss-fuzz-base/base-runner',
   ]
   steps = []

infra/build/functions/trial_build.py

@@ -211,13 +211,30 @@ def trial_build_main(args=None, local_base_build=True):
 
   if not args.skip_build_images:
     logging.info('Starting "Build and Push Images" phase...')
-    if local_base_build:
-      build_and_push_test_images.build_and_push_images(test_image_tag,
-                                                       args.version_tag)
-    else:
-      if not build_and_push_test_images.gcb_build_and_push_images(
-          test_image_tag, version_tag=args.version_tag):
-        return handle_phase1_failure(args.version_tag)
+
+    versions_to_build = ([args.version_tag] if args.version_tag else
+                         build_and_push_test_images.BASE_IMAGE_VERSIONS)
+
+    for version in versions_to_build:
+      logging.info(
+          '================================================================')
+      logging.info('      BUILDING BASE IMAGES FOR VERSION: %s',
+                   version.upper())
+      logging.info(
+          '================================================================')
+      version_test_image_tag = f'{TEST_IMAGE_SUFFIX}-{version}'
+      if args.branch:
+        version_test_image_tag = (
+            f'{version_test_image_tag}-{args.branch.lower().replace("/", "-")}')
+
+      if local_base_build:
+        build_and_push_test_images.build_and_push_images(
+            version_test_image_tag, version)
+      else:
+        if not build_and_push_test_images.gcb_build_and_push_images(
+            version_test_image_tag, version_tag=version):
+          return handle_phase1_failure(version)
+
     logging.info('"Build and Push Images" phase completed.')
   else:
     logging.info(