Skip to content

Commit 4d14b1f

Browse files
ionutgoldanJohanLorenzo
authored andcommitted
Bug 1545402 - Enable rest of tp6m suites
1 parent ac1ddd0 commit 4d14b1f

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

automation/taskcluster/decision_task.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,15 @@ def pr_or_push(is_push=False):
8080
signing_task_id = taskcluster.slugId()
8181
signing_tasks[signing_task_id] = BUILDER.craft_master_commit_signing_task(assemble_task_id, variant)
8282

83-
for craft_function in (
83+
ALL_RAPTOR_CRAFT_FUNCTIONS = [
84+
BUILDER.craft_raptor_tp6m_task(for_suite=i)
85+
for i in range(1, 11)
86+
] + [
8487
BUILDER.craft_raptor_speedometer_task,
8588
BUILDER.craft_raptor_speedometer_power_task,
86-
BUILDER.craft_raptor_tp6m_task
87-
):
89+
]
90+
91+
for craft_function in ALL_RAPTOR_CRAFT_FUNCTIONS:
8892
args = (signing_task_id, mozharness_task_id, variant, gecko_revision)
8993
other_tasks[taskcluster.slugId()] = craft_function(*args)
9094
# we also want the arm APK to be tested on 64-bit-devices

automation/taskcluster/lib/tasks.py

+15-16
Original file line numberDiff line numberDiff line change
@@ -507,22 +507,21 @@ def craft_raptor_speedometer_power_task(self, signing_task_id, mozharness_task_i
507507
force_run_on_64_bit_device=force_run_on_64_bit_device,
508508
)
509509

510-
def craft_raptor_tp6m_task(self, signing_task_id, mozharness_task_id, variant, gecko_revision, force_run_on_64_bit_device=False):
511-
# XXX We are not chunking dynamically, but we have hardcoded jobs that are numbered and
512-
# using chunk is a way to loop over and schedule these jobs easier
513-
chunk = 1
514-
515-
return self._craft_raptor_task(
516-
signing_task_id,
517-
mozharness_task_id,
518-
variant,
519-
gecko_revision,
520-
name_prefix='raptor tp6m-{}'.format(chunk),
521-
description='Raptor tp6m on the Reference Browser',
522-
test_name='raptor-tp6m-{}'.format(chunk),
523-
job_symbol='tp6m-{}'.format(chunk),
524-
force_run_on_64_bit_device=force_run_on_64_bit_device,
525-
)
510+
def craft_raptor_tp6m_task(self, for_suite):
511+
512+
def craft_function(signing_task_id, mozharness_task_id, variant, gecko_revision, force_run_on_64_bit_device=False):
513+
return self._craft_raptor_task(
514+
signing_task_id,
515+
mozharness_task_id,
516+
variant,
517+
gecko_revision,
518+
name_prefix='raptor tp6m-{}'.format(for_suite),
519+
description='Raptor tp6m on the Reference Browser',
520+
test_name='raptor-tp6m-{}'.format(for_suite),
521+
job_symbol='tp6m-{}'.format(for_suite),
522+
force_run_on_64_bit_device=force_run_on_64_bit_device,
523+
)
524+
return craft_function
526525

527526
def _craft_raptor_task(
528527
self,

0 commit comments

Comments
 (0)