Bug 1623355 - Part 8/9 - Set new shippable index's for Android shippable builds. r=aki
authorJustin Wood <Callek@gmail.com>
Thu, 21 May 2020 16:29:48 +0000
changeset 531445 a7d4a9064f3144b581b72b81519b901590598486
parent 531444 9359e7cd13983ef66bf0dea3ba7a0ccf77451044
child 531446 5190da2e563efc3e3357fe3b0fe6fc57be9890e2
push id37439
push userbtara@mozilla.com
push dateThu, 21 May 2020 21:49:34 +0000
treeherdermozilla-central@92c11f0bf14b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki
bugs1623355
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1623355 - Part 8/9 - Set new shippable index's for Android shippable builds. r=aki Differential Revision: https://phabricator.services.mozilla.com/D74360
taskcluster/ci/build/android.yml
taskcluster/taskgraph/transforms/task.py
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -113,17 +113,17 @@ android-x86-shippable/opt:
     description: "Android 4.2 x86 Shippable"
     attributes:
         enable-full-crashsymbols: true
         shippable: true
     shipping-phase: build
     shipping-product: fennec
     index:
         job-name: android-x86-opt
-        type: android-nightly
+        type: android-shippable
     treeherder:
         platform: android-4-2-x86-shippable/opt
         symbol: B
     worker-type: b-linux
     worker:
         env:
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
             MOZ_AUTOMATION_PACKAGE_TESTS: "1"
@@ -165,17 +165,17 @@ android-api-16-shippable/opt:
     use-pgo: true
     attributes:
         enable-full-crashsymbols: true
         shippable: true
     shipping-phase: build
     shipping-product: fennec
     index:
         job-name: android-api-16-opt
-        type: android-nightly-with-multi-l10n
+        type: android-shippable-with-multi-l10n
     treeherder:
         platform: android-4-0-armv7-api16-shippable/opt
         symbol: Bpgo(B)
     worker-type: b-linux
     worker:
         env:
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
             MOZ_AUTOMATION_PACKAGE_TESTS: "1"
@@ -240,17 +240,17 @@ android-aarch64-shippable/opt:
     use-pgo: android-api-16-shippable/opt
     attributes:
         enable-full-crashsymbols: true
         shippable: true
     shipping-phase: build
     shipping-product: fennec
     index:
         job-name: android-aarch64-opt
-        type: android-nightly
+        type: android-shippable
     treeherder:
         platform: android-5-0-aarch64-shippable/opt
         symbol: Bpgo(B)
     worker-type: b-linux
     worker:
         env:
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
             MOZ_AUTOMATION_PACKAGE_TESTS: "1"
@@ -291,17 +291,17 @@ android-x86_64-shippable/opt:
     description: "Android 5.0 x86-64 Shippable"
     attributes:
         enable-full-crashsymbols: true
         shippable: true
     shipping-phase: build
     shipping-product: fennec
     index:
         job-name: android-x86_64-opt
-        type: android-nightly
+        type: android-shippable
     treeherder:
         platform: android-5-0-x86_64-shippable/opt
         symbol: B
     worker-type: b-linux
     worker:
         env:
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
             MOZ_AUTOMATION_PACKAGE_TESTS: "1"
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -138,17 +138,19 @@ task_description_schema = Schema({
         'product': text_type,
 
         # the names to use for this job in the TaskCluster index
         'job-name': text_type,
 
         # Type of gecko v2 index to use
         'type': Any('generic', 'nightly', 'l10n', 'nightly-with-multi-l10n',
                     'nightly-l10n', 'shippable', 'shippable-l10n',
-                    'android-nightly', 'android-nightly-with-multi-l10n'),
+                    'android-nightly', 'android-nightly-with-multi-l10n',
+                    'android-shippable', 'android-shippable-with-multi-l10n',
+                    'shippable-with-multi-l10n'),
 
         # The rank that the task will receive in the TaskCluster
         # index.  A newly completed task supercedes the currently
         # indexed task iff it has a higher rank.  If unspecified,
         # 'by-tier' behavior will be used.
         'rank': Any(
             # Rank is equal the timestamp of the build_date for tier-1
             # tasks, and zero for non-tier-1.  This sorts tier-{2,3}
@@ -1597,16 +1599,23 @@ def add_shippable_index_routes(config, t
 
 @index_builder('nightly-with-multi-l10n')
 def add_nightly_multi_index_routes(config, task):
     task = add_nightly_index_routes(config, task)
     task = add_l10n_index_routes(config, task, force_locale="multi")
     return task
 
 
+@index_builder('shippable-with-multi-l10n')
+def add_shippable_multi_index_routes(config, task):
+    task = add_shippable_index_routes(config, task)
+    task = add_l10n_index_routes(config, task, force_locale="multi")
+    return task
+
+
 @index_builder('l10n')
 def add_l10n_index_routes(config, task, force_locale=None):
     index = task.get('index')
     routes = task.setdefault('routes', [])
 
     verify_index(config, index)
 
     subs = config.params.copy()
@@ -1746,24 +1755,40 @@ def add_geckoview_index_routes(config, t
 @index_builder('android-nightly')
 def add_android_nightly_index_routes(config, task):
     task = add_nightly_index_routes(config, task)
     task = add_geckoview_index_routes(config, task)
 
     return task
 
 
+@index_builder('android-shippable')
+def add_android_shippable_index_routes(config, task):
+    task = add_shippable_index_routes(config, task)
+    task = add_geckoview_index_routes(config, task)
+
+    return task
+
+
 @index_builder('android-nightly-with-multi-l10n')
 def add_android_nightly_multi_index_routes(config, task):
     task = add_nightly_multi_index_routes(config, task)
     task = add_geckoview_index_routes(config, task)
 
     return task
 
 
+@index_builder('android-shippable-with-multi-l10n')
+def add_android_shippable_multi_index_routes(config, task):
+    task = add_shippable_multi_index_routes(config, task)
+    task = add_geckoview_index_routes(config, task)
+
+    return task
+
+
 @transforms.add
 def add_index_routes(config, tasks):
     for task in tasks:
         index = task.get('index', {})
 
         # The default behavior is to rank tasks according to their tier
         extra_index = task.setdefault('extra', {}).setdefault('index', {})
         rank = index.get('rank', 'by-tier')