From bdc21e8a5c8fa9bd2a340c7f0941760bcbf5bcd7 Mon Sep 17 00:00:00 2001 From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:56:03 -0500 Subject: [PATCH 1/3] Update upload_testcase.py --- src/appengine/handlers/upload_testcase.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/appengine/handlers/upload_testcase.py b/src/appengine/handlers/upload_testcase.py index 497de9db973..9cc947dd4ee 100644 --- a/src/appengine/handlers/upload_testcase.py +++ b/src/appengine/handlers/upload_testcase.py @@ -393,6 +393,7 @@ def do_post(self): 'trustedAgreement') == TRUSTED_AGREEMENT_TEXT.strip() if (not trusted_agreement_signed and + utils.is_chromium() and task_utils.is_remotely_executing_utasks() and ((platform_id and platform_id != 'Linux') or job.platform.lower() != 'linux')): From d6c3b091943a745441ee186c0c08fb688fb34847 Mon Sep 17 00:00:00 2001 From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> Date: Wed, 15 Jan 2025 14:04:09 -0500 Subject: [PATCH 2/3] Update upload_testcase.py --- src/appengine/handlers/upload_testcase.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/appengine/handlers/upload_testcase.py b/src/appengine/handlers/upload_testcase.py index 9cc947dd4ee..cb582660ee3 100644 --- a/src/appengine/handlers/upload_testcase.py +++ b/src/appengine/handlers/upload_testcase.py @@ -392,6 +392,8 @@ def do_post(self): trusted_agreement_signed = request.get( 'trustedAgreement') == TRUSTED_AGREEMENT_TEXT.strip() + # Chrome is the only ClusterFuzz deployment where there are trusted bots running utasks. + # This check also fails on oss-fuzz because of the way it abuses platform. if (not trusted_agreement_signed and utils.is_chromium() and task_utils.is_remotely_executing_utasks() and From dbe5f087c08b74f5ea9e60e48c59e50f057beeac Mon Sep 17 00:00:00 2001 From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> Date: Wed, 15 Jan 2025 14:25:40 -0500 Subject: [PATCH 3/3] Update upload_testcase.py --- src/appengine/handlers/upload_testcase.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/appengine/handlers/upload_testcase.py b/src/appengine/handlers/upload_testcase.py index cb582660ee3..6d61068051f 100644 --- a/src/appengine/handlers/upload_testcase.py +++ b/src/appengine/handlers/upload_testcase.py @@ -394,8 +394,7 @@ def do_post(self): # Chrome is the only ClusterFuzz deployment where there are trusted bots running utasks. # This check also fails on oss-fuzz because of the way it abuses platform. - if (not trusted_agreement_signed and - utils.is_chromium() and + if (not trusted_agreement_signed and utils.is_chromium() and task_utils.is_remotely_executing_utasks() and ((platform_id and platform_id != 'Linux') or job.platform.lower() != 'linux')):