[infra] Rename base-msan-builder image to base-sanitizer-libs-builder (#3388). (#4187)

* [infra] Rename base-msan-builder image to base-sanitizer-builder (#3388).

* rename to base-sanitizer-libs-builder

infra/base-images/msan-builder/Dockerfile

@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-msan-builder
+FROM gcr.io/oss-fuzz-base/base-sanitizer-libs-builder
 ENV PYTHONUNBUFFERED 1
 RUN msan_build.py --work-dir=$WORK \
     libarchive13 \

infra/gcb/build_base_images.py

@@ -33,7 +33,7 @@ BASE_IMAGES = [
     'base-builder',
     'base-runner',
     'base-runner-debug',
-    'base-msan-builder',
+    'base-sanitizer-libs-builder',
 ]
 
 TAG_PREFIX = 'gcr.io/oss-fuzz-base/'

infra/gcb/build_msan_libs.py

@@ -21,7 +21,12 @@ def main():
     options = yaml.safe_load(os.environ['GCB_OPTIONS'])
 
   image = 'gcr.io/oss-fuzz-base/msan-builder'
-  steps = build_base_images.get_steps(['base-msan-builder', 'msan-builder'])
+  steps = build_base_images.get_steps(
+      [
+          'base-sanitizer-libs-builder',
+          'msan-builder',
+      ]
+  )
   ts = datetime.datetime.utcnow().strftime('%Y%m%d%H%M')
   upload_name = 'msan-libs-' + ts + '.zip'
 
@@ -47,7 +52,7 @@ def main():
       'timeout': str(6 * 3600) + 's',
       'options': options,
       'images': [
-          'gcr.io/oss-fuzz-base/base-msan-builder',
+          'gcr.io/oss-fuzz-base/base-sanitizer-libs-builder',
           image,
       ],
   }

infra/helper.py

@@ -39,7 +39,7 @@ BASE_IMAGES = [
     'gcr.io/oss-fuzz-base/base-builder',
     'gcr.io/oss-fuzz-base/base-runner',
     'gcr.io/oss-fuzz-base/base-runner-debug',
-    'gcr.io/oss-fuzz-base/base-msan-builder',
+    'gcr.io/oss-fuzz-base/base-sanitizer-libs-builder',
     'gcr.io/oss-fuzz-base/msan-builder',
 ]
 
@@ -567,8 +567,12 @@ def build_fuzzers_impl(  # pylint: disable=too-many-arguments,too-many-locals,to
             '-v',
             '%s:/out' % project_out_dir, '-v',
             '%s:/work' % project_work_dir
-        ] + _env_to_docker_args(env) +
-        ['gcr.io/oss-fuzz-base/base-msan-builder', 'patch_build.py', '/out'])
+        ] + _env_to_docker_args(env) + [
+            'gcr.io/oss-fuzz-base/base-sanitizer-libs-builder',
+            'patch_build.py',
+            '/out'
+        ]
+    )
 
   return 0