[Ubuntu upgrade] Remove support for prebuilt MSAN libraries. (#6280)

This is done in anticipation of the upgrade to Ubuntu 20.04 which wont support this.
We'll do this first so we can handle any breakages caused by this step before needing to handle breakages
caused by the upgrade. However, there shouldn't be any breakages due to #6281, but there may be some projects
we overlooked.
The only exception to this is libcxx.
Related: #6180.

5 files changed, 1 insertions, 65 deletions

diff --git a/infra/build/functions/base_images.py b/infra/build/functions/base_images.py
index 9914be1d..cbcd599d 100644
--- a/infra/build/functions/base_images.py
+++ b/infra/build/functions/base_images.py
@@ -15,7 +15,6 @@
 ################################################################################
 """Cloud function to build base images on Google Cloud Builder."""
 
-import datetime
 import logging
 
 import google.auth
@@ -34,7 +33,6 @@ BASE_PROJECT = 'oss-fuzz-base'
 TAG_PREFIX = f'gcr.io/{BASE_PROJECT}/'
 
 BASE_SANITIZER_LIBS_IMAGE = TAG_PREFIX + 'base-sanitizer-libs-builder'
-MSAN_LIBS_IMAGE = TAG_PREFIX + 'msan-libs-builder'
 
 
 def _get_base_image_steps(images, tag_prefix=TAG_PREFIX):
@@ -100,43 +98,3 @@ def base_builder(event, context):
   images = [tag_prefix + base_image for base_image in BASE_IMAGES]
 
   run_build(steps, images)
-
-
-def _get_msan_steps(image):
-  """Get build steps for msan-libs-builder."""
-  timestamp = datetime.datetime.utcnow().strftime('%Y%m%d%H%M')
-  upload_name = 'msan-libs-' + timestamp + '.zip'
-
-  steps = _get_base_image_steps([
-      'base-sanitizer-libs-builder',
-      'msan-libs-builder',
-  ])
-  steps.extend([{
-      'name': image,
-      'args': [
-          'bash',
-          '-c',
-          'cd /msan && zip -r /workspace/libs.zip .',
-      ],
-  }, {
-      'name':
-          'gcr.io/cloud-builders/gsutil',
-      'args': [
-          'cp',
-          '/workspace/libs.zip',
-          'gs://oss-fuzz-msan-libs/' + upload_name,
-      ],
-  }])
-  return steps
-
-
-def base_msan_builder(event, context):
-  """Cloud function to build base images."""
-  del event, context
-  steps = _get_msan_steps(MSAN_LIBS_IMAGE)
-  images = [
-      BASE_SANITIZER_LIBS_IMAGE,
-      MSAN_LIBS_IMAGE,
-  ]
-
-  run_build(steps, images)
diff --git a/infra/build/functions/build_project.py b/infra/build/functions/build_project.py
index ea98d02c..a96f5758 100755
--- a/infra/build/functions/build_project.py
+++ b/infra/build/functions/build_project.py
@@ -144,15 +144,6 @@ def get_build_steps(project_name, project_yaml_file, dockerfile_lines,
   time_stamp = datetime.datetime.now().strftime('%Y%m%d%H%M')
 
   build_steps = build_lib.project_image_steps(name, image, language)
-  # Copy over MSan instrumented libraries.
-  build_steps.append({
-      'name': f'gcr.io/{base_images_project}/msan-libs-builder',
-      'args': [
-          'bash',
-          '-c',
-          'cp -r /msan /workspace',
-      ],
-  })
 
   # Sort engines to make AFL first to test if libFuzzer has an advantage in
   # finding bugs first since it is generally built first.
diff --git a/infra/build/functions/main.py b/infra/build/functions/main.py
index 1bfd3581..c34dc132 100644
--- a/infra/build/functions/main.py
+++ b/infra/build/functions/main.py
@@ -45,8 +45,3 @@ def coverage_build(event, context):
 def builds_status(event, context):
   """Entry point for builds status cloud function."""
   update_build_status.update_status(event, context)
-
-
-def build_msan(event, context):
-  """Entry point for base msan builder."""
-  base_images.base_msan_builder(event, context)
diff --git a/infra/build/functions/test_data/expected_build_steps.json b/infra/build/functions/test_data/expected_build_steps.json
index 271e43fe..f8c525c2 100644
--- a/infra/build/functions/test_data/expected_build_steps.json
+++ b/infra/build/functions/test_data/expected_build_steps.json
@@ -29,14 +29,6 @@
     ]
   },
   {
-    "name": "gcr.io/oss-fuzz-base/msan-libs-builder",
-    "args": [
-      "bash",
-      "-c",
-      "cp -r /msan /workspace"
-    ]
-  },
-  {
     "name": "gcr.io/oss-fuzz/test-project",
     "env": [
       "FUZZING_ENGINE=afl",
diff --git a/infra/build/functions/test_data/expected_coverage_build_steps.json b/infra/build/functions/test_data/expected_coverage_build_steps.json
index 19b1d5b8..8db36a37 100644
--- a/infra/build/functions/test_data/expected_coverage_build_steps.json
+++ b/infra/build/functions/test_data/expected_coverage_build_steps.json
@@ -141,4 +141,4 @@
       "test_url"
     ]
   }
-]
\ No newline at end of file
+]