Improves nightly and beta treeherder symbols

mozilla-mobile · Apr 29, 2019 · 618fa05 · 618fa05
1 parent d49c798
commit 618fa05
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.taskcluster.yml b/.taskcluster.yml
@@ -183,7 +183,7 @@ tasks:
                       && python automation/taskcluster/decision_task.py beta ${event.release.tag_name}
                 extra:
                   treeherder:
-                    symbol: B
+                    symbol: beta-D
                 metadata:
                   name: Fenix Beta Decision Task
                   description: Building and releasing Fenix to the beta channel - triggered by release ${event.release.tag_name}
@@ -213,7 +213,7 @@ tasks:
                 extra:
                   cron: {$json: {$eval: 'cron'}}
                   treeherder:
-                    symbol: N
+                    symbol: nightly-D
                 metadata:
                   name: Fenix Nightly Decision Task
                   description: Decision task scheduled by cron task [${cron.task_id}](https://tools.taskcluster.net/tasks/${cron.task_id})
diff --git a/automation/taskcluster/decision_task.py b/automation/taskcluster/decision_task.py
@@ -55,7 +55,7 @@ def pr_or_push(is_push):
         print("Exit")
         return {}
 
-    variants = get_build_variants()
+    variants = [variant for variant in get_build_variants() if variant.endswith('Debug')]
     geckoview_nightly_version = get_geckoview_versions()['nightly']
     mozharness_task_id = fetch_mozharness_task_id(geckoview_nightly_version)
     gecko_revision = taskcluster.Queue().task(mozharness_task_id)['payload']['env']['GECKO_HEAD_REV']

diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py
@@ -75,10 +75,10 @@ def secret_index(name):
             )
         )
 
-        capitalized_build_type = upper_case_first_letter(track)
+        capitalized_track = upper_case_first_letter(track)
         gradle_commands = (
             './gradlew --no-daemon -PcrashReports=true -Ptelemetry=true -PversionName={} clean test assemble{}'.format(
-                version_name, capitalized_build_type),
+                version_name, capitalized_track),
         )
 
         command = ' && '.join(
@@ -93,8 +93,8 @@ def secret_index(name):
         ]
 
         return self._craft_build_ish_task(
-            name='Build {} task'.format(capitalized_build_type),
-            description='Build Fenix {} from source code'.format(capitalized_build_type),
+            name='Build {} task'.format(capitalized_track),
+            description='Build Fenix {} from source code'.format(capitalized_track),
             command=command,
             scopes=[
                 "secrets:get:{}".format(secret) for secret in (sentry_secret, leanplum_secret, adjust_secret)
@@ -106,7 +106,7 @@ def secret_index(name):
                 'machine': {
                     'platform': 'android-all',
                 },
-                'symbol': '{}A'.format(capitalized_build_type[0]),
+                'symbol': '{}-A'.format(track),
                 'tier': 1,
             },
         )
@@ -390,7 +390,7 @@ def craft_master_commit_signing_task(
     def craft_release_signing_task(
         self, build_task_id, apk_paths, track, is_staging=False,
     ):
-        capitalized_build_type = upper_case_first_letter(track)
+        capitalized_track = upper_case_first_letter(track)
         index_release = 'staging.{}'.format(track) if is_staging else track
 
         routes = [
@@ -404,8 +404,8 @@ def craft_release_signing_task(
         ]
 
         return self._craft_signing_task(
-            name="Signing {} task".format(capitalized_build_type),
-            description="Sign {} builds of Fenix".format(capitalized_build_type),
+            name="Signing {} task".format(capitalized_track),
+            description="Sign {} builds of Fenix".format(capitalized_track),
             signing_type="dep" if is_staging else track,
             assemble_task_id=build_task_id,
             apk_paths=apk_paths,
@@ -415,7 +415,7 @@ def craft_release_signing_task(
                 'machine': {
                   'platform': 'android-all',
                 },
-                'symbol': '{}s'.format(capitalized_build_type[0]),
+                'symbol': '{}-s'.format(track),
                 'tier': 1,
             },
         )
@@ -453,7 +453,7 @@ def craft_push_task(
                 'machine': {
                   'platform': 'android-all',
                 },
-                'symbol': 'gp',
+                'symbol': '{}-gp'.format(track),
                 'tier': 1,
             },
         )