From 3c1b8eff3887019c8c35afcfd1ff7989bc8e7f5f Mon Sep 17 00:00:00 2001 From: Jonathan Metzman Date: Wed, 21 Aug 2024 12:45:32 -0400 Subject: [PATCH] Delete SHARE_BUILD_WITH_JOB_TYPE feature. It's a clever feature that needs bad complexity to support and doesn't appear to be used. Fixes: https://github.com/google/clusterfuzz/issues/4195 --- .../_internal/build_management/build_manager.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/clusterfuzz/_internal/build_management/build_manager.py b/src/clusterfuzz/_internal/build_management/build_manager.py index e7d6446a7d..d584ab5d72 100644 --- a/src/clusterfuzz/_internal/build_management/build_manager.py +++ b/src/clusterfuzz/_internal/build_management/build_manager.py @@ -1279,17 +1279,7 @@ def setup_symbolized_builds(revision): def setup_custom_binary(target_weights=None): """Set up the custom binary for a particular job.""" - # Check if this build is dependent on any other custom job. If yes, - # then fake out our job name for setting up the build. - old_job_name = '' - share_build_job_type = environment.get_value('SHARE_BUILD_WITH_JOB_TYPE') - if share_build_job_type: - job_name = share_build_job_type - old_job_name = environment.get_value('JOB_NAME', '') - environment.set_value('JOB_NAME', job_name) - else: - job_name = environment.get_value('JOB_NAME', '') - + job_name = environment.get_value('JOB_NAME') # Verify that this is really a custom binary job. job = data_types.Job.query(data_types.Job.name == job_name).get() if not job or not job.custom_binary_key or not job.custom_binary_filename: @@ -1305,10 +1295,6 @@ def setup_custom_binary(target_weights=None): job.custom_binary_revision, target_weights=target_weights) - # Revert back the actual job name. - if share_build_job_type: - environment.set_value('JOB_NAME', old_job_name) - if build.setup(): return build