From a9d0062a554b1598fbbb71ccd1c38d46c3c80c45 Mon Sep 17 00:00:00 2001 From: Max Moroz Date: Thu, 23 Jul 2020 16:36:58 -0700 Subject: [PATCH] [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 --- .../Dockerfile | 0 .../compiler_wrapper.py | 0 .../compiler_wrapper_test.py | 0 .../msan_build.py | 0 .../packages/__init__.py | 0 .../packages/boost1_58.py | 0 .../packages/gnutls28.py | 0 .../packages/libgcrypt20.py | 0 .../packages/mesa.py | 0 .../packages/nettle.py | 0 .../packages/openssl.py | 0 .../packages/package.py | 0 .../packages/pixman.py | 0 .../packages/pixman_blacklist.txt | 0 .../packages/pulseaudio.py | 0 .../packages/pulseaudio_fix_android.patch | 0 .../packages/sqlite3.py | 0 .../packages/systemd.py | 0 .../packages/tar.py | 0 .../patch_build.py | 0 .../wrapper_utils.py | 0 infra/base-images/msan-builder/Dockerfile | 2 +- infra/gcb/build_base_images.py | 2 +- infra/gcb/build_msan_libs.py | 9 +++++++-- infra/helper.py | 10 +++++++--- 25 files changed, 16 insertions(+), 7 deletions(-) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/Dockerfile (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/compiler_wrapper.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/compiler_wrapper_test.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/msan_build.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/__init__.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/boost1_58.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/gnutls28.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/libgcrypt20.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/mesa.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/nettle.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/openssl.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/package.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/pixman.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/pixman_blacklist.txt (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/pulseaudio.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/pulseaudio_fix_android.patch (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/sqlite3.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/systemd.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/packages/tar.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/patch_build.py (100%) rename infra/base-images/{base-msan-builder => base-sanitizer-libs-builder}/wrapper_utils.py (100%) diff --git a/infra/base-images/base-msan-builder/Dockerfile b/infra/base-images/base-sanitizer-libs-builder/Dockerfile similarity index 100% rename from infra/base-images/base-msan-builder/Dockerfile rename to infra/base-images/base-sanitizer-libs-builder/Dockerfile diff --git a/infra/base-images/base-msan-builder/compiler_wrapper.py b/infra/base-images/base-sanitizer-libs-builder/compiler_wrapper.py similarity index 100% rename from infra/base-images/base-msan-builder/compiler_wrapper.py rename to infra/base-images/base-sanitizer-libs-builder/compiler_wrapper.py diff --git a/infra/base-images/base-msan-builder/compiler_wrapper_test.py b/infra/base-images/base-sanitizer-libs-builder/compiler_wrapper_test.py similarity index 100% rename from infra/base-images/base-msan-builder/compiler_wrapper_test.py rename to infra/base-images/base-sanitizer-libs-builder/compiler_wrapper_test.py diff --git a/infra/base-images/base-msan-builder/msan_build.py b/infra/base-images/base-sanitizer-libs-builder/msan_build.py similarity index 100% rename from infra/base-images/base-msan-builder/msan_build.py rename to infra/base-images/base-sanitizer-libs-builder/msan_build.py diff --git a/infra/base-images/base-msan-builder/packages/__init__.py b/infra/base-images/base-sanitizer-libs-builder/packages/__init__.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/__init__.py rename to infra/base-images/base-sanitizer-libs-builder/packages/__init__.py diff --git a/infra/base-images/base-msan-builder/packages/boost1_58.py b/infra/base-images/base-sanitizer-libs-builder/packages/boost1_58.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/boost1_58.py rename to infra/base-images/base-sanitizer-libs-builder/packages/boost1_58.py diff --git a/infra/base-images/base-msan-builder/packages/gnutls28.py b/infra/base-images/base-sanitizer-libs-builder/packages/gnutls28.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/gnutls28.py rename to infra/base-images/base-sanitizer-libs-builder/packages/gnutls28.py diff --git a/infra/base-images/base-msan-builder/packages/libgcrypt20.py b/infra/base-images/base-sanitizer-libs-builder/packages/libgcrypt20.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/libgcrypt20.py rename to infra/base-images/base-sanitizer-libs-builder/packages/libgcrypt20.py diff --git a/infra/base-images/base-msan-builder/packages/mesa.py b/infra/base-images/base-sanitizer-libs-builder/packages/mesa.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/mesa.py rename to infra/base-images/base-sanitizer-libs-builder/packages/mesa.py diff --git a/infra/base-images/base-msan-builder/packages/nettle.py b/infra/base-images/base-sanitizer-libs-builder/packages/nettle.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/nettle.py rename to infra/base-images/base-sanitizer-libs-builder/packages/nettle.py diff --git a/infra/base-images/base-msan-builder/packages/openssl.py b/infra/base-images/base-sanitizer-libs-builder/packages/openssl.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/openssl.py rename to infra/base-images/base-sanitizer-libs-builder/packages/openssl.py diff --git a/infra/base-images/base-msan-builder/packages/package.py b/infra/base-images/base-sanitizer-libs-builder/packages/package.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/package.py rename to infra/base-images/base-sanitizer-libs-builder/packages/package.py diff --git a/infra/base-images/base-msan-builder/packages/pixman.py b/infra/base-images/base-sanitizer-libs-builder/packages/pixman.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/pixman.py rename to infra/base-images/base-sanitizer-libs-builder/packages/pixman.py diff --git a/infra/base-images/base-msan-builder/packages/pixman_blacklist.txt b/infra/base-images/base-sanitizer-libs-builder/packages/pixman_blacklist.txt similarity index 100% rename from infra/base-images/base-msan-builder/packages/pixman_blacklist.txt rename to infra/base-images/base-sanitizer-libs-builder/packages/pixman_blacklist.txt diff --git a/infra/base-images/base-msan-builder/packages/pulseaudio.py b/infra/base-images/base-sanitizer-libs-builder/packages/pulseaudio.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/pulseaudio.py rename to infra/base-images/base-sanitizer-libs-builder/packages/pulseaudio.py diff --git a/infra/base-images/base-msan-builder/packages/pulseaudio_fix_android.patch b/infra/base-images/base-sanitizer-libs-builder/packages/pulseaudio_fix_android.patch similarity index 100% rename from infra/base-images/base-msan-builder/packages/pulseaudio_fix_android.patch rename to infra/base-images/base-sanitizer-libs-builder/packages/pulseaudio_fix_android.patch diff --git a/infra/base-images/base-msan-builder/packages/sqlite3.py b/infra/base-images/base-sanitizer-libs-builder/packages/sqlite3.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/sqlite3.py rename to infra/base-images/base-sanitizer-libs-builder/packages/sqlite3.py diff --git a/infra/base-images/base-msan-builder/packages/systemd.py b/infra/base-images/base-sanitizer-libs-builder/packages/systemd.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/systemd.py rename to infra/base-images/base-sanitizer-libs-builder/packages/systemd.py diff --git a/infra/base-images/base-msan-builder/packages/tar.py b/infra/base-images/base-sanitizer-libs-builder/packages/tar.py similarity index 100% rename from infra/base-images/base-msan-builder/packages/tar.py rename to infra/base-images/base-sanitizer-libs-builder/packages/tar.py diff --git a/infra/base-images/base-msan-builder/patch_build.py b/infra/base-images/base-sanitizer-libs-builder/patch_build.py similarity index 100% rename from infra/base-images/base-msan-builder/patch_build.py rename to infra/base-images/base-sanitizer-libs-builder/patch_build.py diff --git a/infra/base-images/base-msan-builder/wrapper_utils.py b/infra/base-images/base-sanitizer-libs-builder/wrapper_utils.py similarity index 100% rename from infra/base-images/base-msan-builder/wrapper_utils.py rename to infra/base-images/base-sanitizer-libs-builder/wrapper_utils.py diff --git a/infra/base-images/msan-builder/Dockerfile b/infra/base-images/msan-builder/Dockerfile index 5f6091a10..319b72de6 100644 --- a/infra/base-images/msan-builder/Dockerfile +++ b/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 \ diff --git a/infra/gcb/build_base_images.py b/infra/gcb/build_base_images.py index a950c85a1..daadb9efe 100755 --- a/infra/gcb/build_base_images.py +++ b/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/' diff --git a/infra/gcb/build_msan_libs.py b/infra/gcb/build_msan_libs.py index 2c87b15a3..124ad8900 100755 --- a/infra/gcb/build_msan_libs.py +++ b/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, ], } diff --git a/infra/helper.py b/infra/helper.py index de1684a5b..caec83b82 100755 --- a/infra/helper.py +++ b/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