diff options
author | jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2021-08-25 08:36:05 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-25 15:36:05 +0000 |
commit | 3a4e6e4484a1395f0f007fe431aab7d1c88a37ad (patch) | |
tree | 86c91281c50460d085c2d000fbb29890f59c16ae /infra/build/functions/base_images.py | |
parent | ffe20d3857f020d7e4620494b6ee9e2c271920c7 (diff) |
[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.
Diffstat (limited to 'infra/build/functions/base_images.py')
-rw-r--r-- | infra/build/functions/base_images.py | 42 |
1 files changed, 0 insertions, 42 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) |