parent
449fffe933
commit
9a2cf4339b
|
@ -48,9 +48,9 @@ android {
|
||||||
applicationIdSuffix ".debug"
|
applicationIdSuffix ".debug"
|
||||||
manifestPlaceholders.isRaptorEnabled = "true"
|
manifestPlaceholders.isRaptorEnabled = "true"
|
||||||
}
|
}
|
||||||
// "releaseRaptor" is only used for performance testing, and isn't a real "release" type
|
raptor releaseTemplate >> { // the ">>" concatenates the raptor-specific options with the template
|
||||||
releaseRaptor releaseTemplate >> { // the ">>" concatenates the releaseRaptor-specific options with the template
|
|
||||||
manifestPlaceholders.isRaptorEnabled = "true"
|
manifestPlaceholders.isRaptorEnabled = "true"
|
||||||
|
applicationIdSuffix ".raptor"
|
||||||
}
|
}
|
||||||
nightly releaseTemplate >> {
|
nightly releaseTemplate >> {
|
||||||
buildConfigField "boolean", "IS_RELEASED", "true"
|
buildConfigField "boolean", "IS_RELEASED", "true"
|
||||||
|
|
|
@ -72,12 +72,12 @@ def pr_or_push(is_push):
|
||||||
# autophone only supports arm and aarch64, so only sign/perftest those builds
|
# autophone only supports arm and aarch64, so only sign/perftest those builds
|
||||||
if (
|
if (
|
||||||
is_push and
|
is_push and
|
||||||
build_type == 'releaseRaptor' and
|
build_type == 'raptor' and
|
||||||
architecture in ('arm', 'aarch64') and
|
architecture in ('arm', 'aarch64') and
|
||||||
SHORT_HEAD_BRANCH == 'master'
|
SHORT_HEAD_BRANCH == 'master'
|
||||||
):
|
):
|
||||||
signing_task_id = taskcluster.slugId()
|
signing_task_id = taskcluster.slugId()
|
||||||
signing_tasks[signing_task_id] = BUILDER.craft_master_commit_signing_task(assemble_task_id, variant)
|
signing_tasks[signing_task_id] = BUILDER.craft_raptor_signing_task(assemble_task_id, variant)
|
||||||
|
|
||||||
ALL_RAPTOR_CRAFT_FUNCTIONS = [
|
ALL_RAPTOR_CRAFT_FUNCTIONS = [
|
||||||
BUILDER.craft_raptor_tp6m_cold_task(for_suite=i)
|
BUILDER.craft_raptor_tp6m_cold_task(for_suite=i)
|
||||||
|
|
|
@ -175,7 +175,7 @@ class TaskBuilder(object):
|
||||||
return self._craft_clean_gradle_task(
|
return self._craft_clean_gradle_task(
|
||||||
name='lint',
|
name='lint',
|
||||||
description='Running lint for aarch64 release variant',
|
description='Running lint for aarch64 release variant',
|
||||||
gradle_task='lintAarch64Release',
|
gradle_task='lintAarch64Nightly',
|
||||||
treeherder={
|
treeherder={
|
||||||
'jobKind': 'test',
|
'jobKind': 'test',
|
||||||
'machine': {
|
'machine': {
|
||||||
|
@ -341,27 +341,25 @@ class TaskBuilder(object):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
def craft_master_commit_signing_task(
|
def craft_raptor_signing_task(
|
||||||
self, assemble_task_id, variant
|
self, assemble_task_id, variant
|
||||||
):
|
):
|
||||||
architecture, build_type = get_architecture_and_build_type_from_variant(variant)
|
architecture, _ = get_architecture_and_build_type_from_variant(variant)
|
||||||
build_type = convert_camel_case_into_kebab_case(build_type)
|
|
||||||
|
|
||||||
routes = []
|
routes = []
|
||||||
if self.repo_url == _OFFICIAL_REPO_URL:
|
if self.repo_url == _OFFICIAL_REPO_URL:
|
||||||
routes = [
|
routes = [
|
||||||
'index.project.mobile.fenix.v2.branch.master.revision.{}.{}.{}'.format(
|
'index.project.mobile.fenix.v2.branch.master.revision.{}.{}.{}'.format(
|
||||||
self.commit, build_type, architecture
|
self.commit, 'raptor', architecture
|
||||||
),
|
),
|
||||||
'index.project.mobile.fenix.v2.branch.master.latest.{}.{}'.format(
|
'index.project.mobile.fenix.v2.branch.master.latest.{}.{}'.format(
|
||||||
build_type, architecture
|
'raptor', architecture
|
||||||
),
|
),
|
||||||
'index.project.mobile.fenix.v2.branch.master.pushdate.{}.{}.{}.revision.{}.{}.{}'.format(
|
'index.project.mobile.fenix.v2.branch.master.pushdate.{}.{}.{}.revision.{}.{}.{}'.format(
|
||||||
self.date.year, self.date.month, self.date.day, self.commit,
|
self.date.year, self.date.month, self.date.day, self.commit,
|
||||||
build_type, architecture
|
'raptor', architecture
|
||||||
),
|
),
|
||||||
'index.project.mobile.fenix.v2.branch.master.pushdate.{}.{}.{}.latest.{}.{}'.format(
|
'index.project.mobile.fenix.v2.branch.master.pushdate.{}.{}.{}.latest.{}.{}'.format(
|
||||||
self.date.year, self.date.month, self.date.day, build_type, architecture
|
self.date.year, self.date.month, self.date.day, 'raptor', architecture
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -525,7 +523,7 @@ class TaskBuilder(object):
|
||||||
"--test-packages-url={}/{}/artifacts/public/build/target.test_packages.json".format(_DEFAULT_TASK_URL, mozharness_task_id),
|
"--test-packages-url={}/{}/artifacts/public/build/target.test_packages.json".format(_DEFAULT_TASK_URL, mozharness_task_id),
|
||||||
"--test={}".format(test_name),
|
"--test={}".format(test_name),
|
||||||
"--app=fenix",
|
"--app=fenix",
|
||||||
"--binary=org.mozilla.fenix",
|
"--binary=org.mozilla.fenix.raptor",
|
||||||
"--activity=GeckoViewActivity",
|
"--activity=GeckoViewActivity",
|
||||||
"--download-symbols=ondemand"
|
"--download-symbols=ondemand"
|
||||||
] + extra_test_args,
|
] + extra_test_args,
|
||||||
|
|
Loading…
Reference in New Issue