From 93e112a4ccc7ae6a1265de84c715100abfb91dd2 Mon Sep 17 00:00:00 2001 From: Jonathan Metzman Date: Mon, 19 Aug 2024 12:12:29 -0400 Subject: [PATCH] Revert "Add centipede to DEFAULT_ENGINES (#4040)" This reverts commit 153c555106bc0dcf87d7007fbfc9232b71572b0d. --- .../_internal/cron/project_setup.py | 2 +- .../handlers/cron/project_setup_test.py | 46 ------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/src/clusterfuzz/_internal/cron/project_setup.py b/src/clusterfuzz/_internal/cron/project_setup.py index 59ca3be048..a9ceea6642 100644 --- a/src/clusterfuzz/_internal/cron/project_setup.py +++ b/src/clusterfuzz/_internal/cron/project_setup.py @@ -201,7 +201,7 @@ def job_name(self, project_name, config_suffix): DEFAULT_ARCHITECTURES = ['x86_64'] DEFAULT_SANITIZERS = ['address', 'undefined'] -DEFAULT_ENGINES = ['libfuzzer', 'afl', 'honggfuzz', 'centipede'] +DEFAULT_ENGINES = ['libfuzzer', 'afl', 'honggfuzz'] def _to_experimental_job(job_info): diff --git a/src/clusterfuzz/_internal/tests/appengine/handlers/cron/project_setup_test.py b/src/clusterfuzz/_internal/tests/appengine/handlers/cron/project_setup_test.py index d8930b80bd..3677a3fc1d 100644 --- a/src/clusterfuzz/_internal/tests/appengine/handlers/cron/project_setup_test.py +++ b/src/clusterfuzz/_internal/tests/appengine/handlers/cron/project_setup_test.py @@ -531,29 +531,6 @@ def test_execute(self): 'AUTOMATIC_LABELS = Proj-lib7,Engine-libfuzzer,custom\n' 'FILE_GITHUB_ISSUE = False\n') - job = data_types.Job.query( - data_types.Job.name == 'centipede_asan_lib1').get() - self.assertIsNotNone(job) - self.assertEqual(job.project, 'lib1') - self.assertEqual(job.platform, 'LIB1_LINUX') - self.assertCountEqual(job.templates, ['engine_asan', 'centipede']) - self.assertEqual( - job.environment_string, 'RELEASE_BUILD_BUCKET_PATH = ' - 'gs://clusterfuzz-builds-centipede/lib1/lib1-none-([0-9]+).zip\n' - 'PROJECT_NAME = lib1\n' - 'SUMMARY_PREFIX = lib1\n' - 'MANAGED = True\n' - 'EXTRA_BUILD_BUCKET_PATH = ' - 'gs://clusterfuzz-builds-centipede/lib1/lib1-address-([0-9]+).zip\n' - 'REVISION_VARS_URL = https://commondatastorage.googleapis.com/' - 'clusterfuzz-builds-centipede/lib1/lib1-address-%s.srcmap.json\n' - 'FUZZ_LOGS_BUCKET = lib1-logs.clusterfuzz-external.appspot.com\n' - 'CORPUS_BUCKET = lib1-corpus.clusterfuzz-external.appspot.com\n' - 'QUARANTINE_BUCKET = lib1-quarantine.clusterfuzz-external.appspot.com\n' - 'BACKUP_BUCKET = lib1-backup.clusterfuzz-external.appspot.com\n' - 'AUTOMATIC_LABELS = Proj-lib1,Engine-centipede\n' - 'FILE_GITHUB_ISSUE = False\n') - job = data_types.Job.query( data_types.Job.name == 'centipede_asan_lib9').get() self.assertIsNotNone(job) @@ -607,7 +584,6 @@ def test_execute(self): centipede = data_types.Fuzzer.query( data_types.Fuzzer.name == 'centipede').get() self.assertCountEqual(centipede.jobs, [ - 'centipede_asan_lib1', 'centipede_asan_lib9', ]) @@ -1341,7 +1317,6 @@ def test_execute(self): ('LIB7_LINUX', 'libFuzzer', 'libfuzzer_asan_lib7'), ('LIB8_LINUX', 'libFuzzer', 'libfuzzer_nosanitizer_i386_lib8'), ('LIB8_LINUX', 'libFuzzer', 'libfuzzer_nosanitizer_lib8'), - ('LIB1_LINUX', 'centipede', 'centipede_asan_lib1'), ('LIB9_LINUX', 'centipede', 'centipede_asan_lib9'), ]) @@ -1596,27 +1571,6 @@ def test_execute(self): 'entity_name': 'libfuzzer_nosanitizer_i386_lib8', 'auto_cc': 1 }, - { - 'entity_kind': 1, - 'is_prefix': False, - 'auto_cc': 1, - 'entity_name': 'centipede_asan_lib1', - 'email': 'primary@example.com' - }, - { - 'entity_kind': 1, - 'is_prefix': False, - 'auto_cc': 1, - 'entity_name': 'centipede_asan_lib1', - 'email': 'user@example.com' - }, - { - 'entity_kind': 1, - 'is_prefix': False, - 'auto_cc': 1, - 'entity_name': 'centipede_asan_lib1', - 'email': 'user2@googlemail.com' - }, { 'entity_kind': 1, 'is_prefix': False,