diff options
Diffstat (limited to 'infra')
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/Dockerfile (renamed from infra/base-images/base-msan-builder/Dockerfile) | 0 | ||||
-rwxr-xr-x | infra/base-images/base-sanitizer-libs-builder/compiler_wrapper.py (renamed from infra/base-images/base-msan-builder/compiler_wrapper.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/compiler_wrapper_test.py (renamed from infra/base-images/base-msan-builder/compiler_wrapper_test.py) | 0 | ||||
-rwxr-xr-x | infra/base-images/base-sanitizer-libs-builder/msan_build.py (renamed from infra/base-images/base-msan-builder/msan_build.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/__init__.py (renamed from infra/base-images/base-msan-builder/packages/__init__.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/boost1_58.py (renamed from infra/base-images/base-msan-builder/packages/boost1_58.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/gnutls28.py (renamed from infra/base-images/base-msan-builder/packages/gnutls28.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/libgcrypt20.py (renamed from infra/base-images/base-msan-builder/packages/libgcrypt20.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/mesa.py (renamed from infra/base-images/base-msan-builder/packages/mesa.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/nettle.py (renamed from infra/base-images/base-msan-builder/packages/nettle.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/openssl.py (renamed from infra/base-images/base-msan-builder/packages/openssl.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/package.py (renamed from infra/base-images/base-msan-builder/packages/package.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/pixman.py (renamed from infra/base-images/base-msan-builder/packages/pixman.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/pixman_blacklist.txt (renamed from infra/base-images/base-msan-builder/packages/pixman_blacklist.txt) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/pulseaudio.py (renamed from infra/base-images/base-msan-builder/packages/pulseaudio.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/pulseaudio_fix_android.patch (renamed from infra/base-images/base-msan-builder/packages/pulseaudio_fix_android.patch) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/sqlite3.py (renamed from infra/base-images/base-msan-builder/packages/sqlite3.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/systemd.py (renamed from infra/base-images/base-msan-builder/packages/systemd.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/packages/tar.py (renamed from infra/base-images/base-msan-builder/packages/tar.py) | 0 | ||||
-rwxr-xr-x | infra/base-images/base-sanitizer-libs-builder/patch_build.py (renamed from infra/base-images/base-msan-builder/patch_build.py) | 0 | ||||
-rw-r--r-- | infra/base-images/base-sanitizer-libs-builder/wrapper_utils.py (renamed from infra/base-images/base-msan-builder/wrapper_utils.py) | 0 | ||||
-rw-r--r-- | infra/base-images/msan-builder/Dockerfile | 2 | ||||
-rwxr-xr-x | infra/gcb/build_base_images.py | 2 | ||||
-rwxr-xr-x | infra/gcb/build_msan_libs.py | 9 | ||||
-rwxr-xr-x | infra/helper.py | 10 |
25 files changed, 16 insertions, 7 deletions
diff --git a/infra/base-images/base-msan-builder/Dockerfile b/infra/base-images/base-sanitizer-libs-builder/Dockerfile index 315730b6..315730b6 100644 --- a/infra/base-images/base-msan-builder/Dockerfile +++ b/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 index 04aa4207..04aa4207 100755 --- a/infra/base-images/base-msan-builder/compiler_wrapper.py +++ b/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 index a05592d3..a05592d3 100644 --- a/infra/base-images/base-msan-builder/compiler_wrapper_test.py +++ b/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 index 928b1a59..928b1a59 100755 --- a/infra/base-images/base-msan-builder/msan_build.py +++ b/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 index e69de29b..e69de29b 100644 --- a/infra/base-images/base-msan-builder/packages/__init__.py +++ b/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 index 8071b7ec..8071b7ec 100644 --- a/infra/base-images/base-msan-builder/packages/boost1_58.py +++ b/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 index f8407a66..f8407a66 100644 --- a/infra/base-images/base-msan-builder/packages/gnutls28.py +++ b/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 index 9d200af6..9d200af6 100644 --- a/infra/base-images/base-msan-builder/packages/libgcrypt20.py +++ b/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 index ec2e9d21..ec2e9d21 100644 --- a/infra/base-images/base-msan-builder/packages/mesa.py +++ b/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 index e1b0e2f8..e1b0e2f8 100644 --- a/infra/base-images/base-msan-builder/packages/nettle.py +++ b/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 index e24ccc58..e24ccc58 100644 --- a/infra/base-images/base-msan-builder/packages/openssl.py +++ b/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 index 059c2358..059c2358 100644 --- a/infra/base-images/base-msan-builder/packages/package.py +++ b/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 index d63b1468..d63b1468 100644 --- a/infra/base-images/base-msan-builder/packages/pixman.py +++ b/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 index 69cf159d..69cf159d 100644 --- a/infra/base-images/base-msan-builder/packages/pixman_blacklist.txt +++ b/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 index 853b9e72..853b9e72 100644 --- a/infra/base-images/base-msan-builder/packages/pulseaudio.py +++ b/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 index e86f7982..e86f7982 100644 --- 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 diff --git a/infra/base-images/base-msan-builder/packages/sqlite3.py b/infra/base-images/base-sanitizer-libs-builder/packages/sqlite3.py index 3e1a1070..3e1a1070 100644 --- a/infra/base-images/base-msan-builder/packages/sqlite3.py +++ b/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 index 5cb6d60b..5cb6d60b 100644 --- a/infra/base-images/base-msan-builder/packages/systemd.py +++ b/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 index 74abd5c7..74abd5c7 100644 --- a/infra/base-images/base-msan-builder/packages/tar.py +++ b/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 index cb1f4b1d..cb1f4b1d 100755 --- a/infra/base-images/base-msan-builder/patch_build.py +++ b/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 index 0cbf1677..0cbf1677 100644 --- a/infra/base-images/base-msan-builder/wrapper_utils.py +++ b/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 5f6091a1..319b72de 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 a950c85a..daadb9ef 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 2c87b15a..124ad890 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 de1684a5..caec83b8 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 |