blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fixes #1566, #2076 (#2194)

master
Mitchell Hentges 2019-05-02 16:08:31 +02:00 committed by Jeff Boek
parent 449fffe933
commit 9a2cf4339b
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -48,9 +48,9 @@ android {
applicationIdSuffix ".debug"
manifestPlaceholders.isRaptorEnabled = "true"
}
// "releaseRaptor" is only used for performance testing, and isn't a real "release" type
releaseRaptor releaseTemplate >> { // the ">>" concatenates the releaseRaptor-specific options with the template
raptor releaseTemplate >> { // the ">>" concatenates the raptor-specific options with the template
manifestPlaceholders.isRaptorEnabled = "true"
applicationIdSuffix ".raptor"
}
nightly releaseTemplate >> {
buildConfigField "boolean", "IS_RELEASED", "true"

4
automation/taskcluster/decision_task.py
View File

@ -72,12 +72,12 @@ def pr_or_push(is_push):
# autophone only supports arm and aarch64, so only sign/perftest those builds
if (
is_push and
build_type == 'releaseRaptor' and
build_type == 'raptor' and
architecture in ('arm', 'aarch64') and
SHORT_HEAD_BRANCH == 'master'
):
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 = [
BUILDER.craft_raptor_tp6m_cold_task(for_suite=i)

18
automation/taskcluster/lib/tasks.py
View File

@ -175,7 +175,7 @@ class TaskBuilder(object):
return self._craft_clean_gradle_task(
name='lint',
description='Running lint for aarch64 release variant',
gradle_task='lintAarch64Release',
gradle_task='lintAarch64Nightly',
treeherder={
'jobKind': 'test',
'machine': {
@ -341,27 +341,25 @@ class TaskBuilder(object):
},
}
def craft_master_commit_signing_task(
def craft_raptor_signing_task(
self, assemble_task_id, variant
):
architecture, build_type = get_architecture_and_build_type_from_variant(variant)
build_type = convert_camel_case_into_kebab_case(build_type)
architecture, _ = get_architecture_and_build_type_from_variant(variant)
routes = []
if self.repo_url == _OFFICIAL_REPO_URL:
routes = [
'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(
build_type, architecture
'raptor', architecture
),
'index.project.mobile.fenix.v2.branch.master.pushdate.{}.{}.{}.revision.{}.{}.{}'.format(
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(
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={}".format(test_name),
"--app=fenix",
"--binary=org.mozilla.fenix",
"--binary=org.mozilla.fenix.raptor",
"--activity=GeckoViewActivity",
"--download-symbols=ondemand"
] + extra_test_args,