Skip to content

Commit 8374e0c

Browse files
Revert "Add centipede to DEFAULT_ENGINES (#4040)" (#4190)
This reverts commit 153c555. We shouldn't make oss-fuzz jobs for centipede opt-out if builds are opt-out. Related: #4187
1 parent 1100c59 commit 8374e0c

File tree

2 files changed

+1
-47
lines changed

2 files changed

+1
-47
lines changed

src/clusterfuzz/_internal/cron/project_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def job_name(self, project_name, config_suffix):
201201

202202
DEFAULT_ARCHITECTURES = ['x86_64']
203203
DEFAULT_SANITIZERS = ['address', 'undefined']
204-
DEFAULT_ENGINES = ['libfuzzer', 'afl', 'honggfuzz', 'centipede']
204+
DEFAULT_ENGINES = ['libfuzzer', 'afl', 'honggfuzz']
205205

206206

207207
def _to_experimental_job(job_info):

src/clusterfuzz/_internal/tests/appengine/handlers/cron/project_setup_test.py

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -531,29 +531,6 @@ def test_execute(self):
531531
'AUTOMATIC_LABELS = Proj-lib7,Engine-libfuzzer,custom\n'
532532
'FILE_GITHUB_ISSUE = False\n')
533533

534-
job = data_types.Job.query(
535-
data_types.Job.name == 'centipede_asan_lib1').get()
536-
self.assertIsNotNone(job)
537-
self.assertEqual(job.project, 'lib1')
538-
self.assertEqual(job.platform, 'LIB1_LINUX')
539-
self.assertCountEqual(job.templates, ['engine_asan', 'centipede'])
540-
self.assertEqual(
541-
job.environment_string, 'RELEASE_BUILD_BUCKET_PATH = '
542-
'gs://clusterfuzz-builds-centipede/lib1/lib1-none-([0-9]+).zip\n'
543-
'PROJECT_NAME = lib1\n'
544-
'SUMMARY_PREFIX = lib1\n'
545-
'MANAGED = True\n'
546-
'EXTRA_BUILD_BUCKET_PATH = '
547-
'gs://clusterfuzz-builds-centipede/lib1/lib1-address-([0-9]+).zip\n'
548-
'REVISION_VARS_URL = https://commondatastorage.googleapis.com/'
549-
'clusterfuzz-builds-centipede/lib1/lib1-address-%s.srcmap.json\n'
550-
'FUZZ_LOGS_BUCKET = lib1-logs.clusterfuzz-external.appspot.com\n'
551-
'CORPUS_BUCKET = lib1-corpus.clusterfuzz-external.appspot.com\n'
552-
'QUARANTINE_BUCKET = lib1-quarantine.clusterfuzz-external.appspot.com\n'
553-
'BACKUP_BUCKET = lib1-backup.clusterfuzz-external.appspot.com\n'
554-
'AUTOMATIC_LABELS = Proj-lib1,Engine-centipede\n'
555-
'FILE_GITHUB_ISSUE = False\n')
556-
557534
job = data_types.Job.query(
558535
data_types.Job.name == 'centipede_asan_lib9').get()
559536
self.assertIsNotNone(job)
@@ -607,7 +584,6 @@ def test_execute(self):
607584
centipede = data_types.Fuzzer.query(
608585
data_types.Fuzzer.name == 'centipede').get()
609586
self.assertCountEqual(centipede.jobs, [
610-
'centipede_asan_lib1',
611587
'centipede_asan_lib9',
612588
])
613589

@@ -1341,7 +1317,6 @@ def test_execute(self):
13411317
('LIB7_LINUX', 'libFuzzer', 'libfuzzer_asan_lib7'),
13421318
('LIB8_LINUX', 'libFuzzer', 'libfuzzer_nosanitizer_i386_lib8'),
13431319
('LIB8_LINUX', 'libFuzzer', 'libfuzzer_nosanitizer_lib8'),
1344-
('LIB1_LINUX', 'centipede', 'centipede_asan_lib1'),
13451320
('LIB9_LINUX', 'centipede', 'centipede_asan_lib9'),
13461321
])
13471322

@@ -1596,27 +1571,6 @@ def test_execute(self):
15961571
'entity_name': 'libfuzzer_nosanitizer_i386_lib8',
15971572
'auto_cc': 1
15981573
},
1599-
{
1600-
'entity_kind': 1,
1601-
'is_prefix': False,
1602-
'auto_cc': 1,
1603-
'entity_name': 'centipede_asan_lib1',
1604-
'email': '[email protected]'
1605-
},
1606-
{
1607-
'entity_kind': 1,
1608-
'is_prefix': False,
1609-
'auto_cc': 1,
1610-
'entity_name': 'centipede_asan_lib1',
1611-
'email': '[email protected]'
1612-
},
1613-
{
1614-
'entity_kind': 1,
1615-
'is_prefix': False,
1616-
'auto_cc': 1,
1617-
'entity_name': 'centipede_asan_lib1',
1618-
'email': '[email protected]'
1619-
},
16201574
{
16211575
'entity_kind': 1,
16221576
'is_prefix': False,

0 commit comments

Comments
 (0)