Bug 1522111 - Make l10n kind depend on -pgo where available instead of opt. r=tomprince

This avoids opt being pulled in even when l10n is optimized out

Differential Revision: https://phabricator.services.mozilla.com/D19840

--HG--
extra : moz-landing-system : lando

taskcluster/ci/l10n/kind.yml

@@ -22,12 +22,12 @@ kind-dependencies:
 primary-dependency: build
 
 only-for-build-platforms:
-    - linux64/opt
+    - linux64-pgo/opt
     - linux/opt
     - android-api-16/opt
     - macosx64/opt
-    - win32/opt
-    - win64/opt
+    - win32-pgo/opt
+    - win64-pgo/opt
 
 job-template:
     description:
@@ -78,10 +78,10 @@ job-template:
         job-name:
             by-build-platform:
                 linux: linux-opt
-                linux64: linux64-opt
+                linux64.*: linux64-opt
                 macosx64: macosx64-opt
-                win32: win32-opt
-                win64: win64-opt
+                win32.*: win32-opt
+                win64.*: win64-opt
                 android-api-16: android-api-16-opt
     run-on-projects: ['all']
     worker-type:
@@ -98,10 +98,13 @@ job-template:
         platform:
             by-build-platform:
                 linux64: linux64/opt
+                linux64-pgo: linux64-pgo/opt
                 linux: linux32/opt
                 macosx64: osx-cross/opt
                 win32: windows2012-32/opt
+                win32-pgo: windows2012-32-pgo/opt
                 win64: windows2012-64/opt
+                win64-pgo: windows2012-64-pgo/opt
                 android-api-16: android-4-0-armv7-api16/opt
     env:
         by-build-platform:
@@ -131,7 +134,7 @@ job-template:
                     - single_locale/linux32.py
                     - single_locale/tc_common.py
                     - single_locale/tc_linux_common.py
-                linux64:
+                linux64.*:
                     - single_locale/firefox.py
                     - single_locale/linux64.py
                     - single_locale/tc_common.py
@@ -141,12 +144,12 @@ job-template:
                     - single_locale/macosx64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_macosx64.py
-                win32:
+                win32.*:
                     - single_locale/firefox.py
                     - single_locale/win32.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win32.py
-                win64:
+                win64.*:
                     - single_locale/firefox.py
                     - single_locale/win64.py
                     - single_locale/tc_common.py

taskcluster/ci/repackage-signing/kind.yml

@@ -16,9 +16,9 @@ kind-dependencies:
 only-for-build-platforms:
    - win32-nightly/opt
    - win32-devedition-nightly/opt
-   - win32/opt
+   - win32-pgo/opt
    - win64-nightly/opt
    - win64-devedition-nightly/opt
-   - win64/opt
+   - win64-pgo/opt
    - win64-aarch64-nightly/opt
    - win64-asan-reporter-nightly/opt

taskcluster/ci/repackage/kind.yml

@@ -24,16 +24,19 @@ only-for-build-platforms:
     - linux64-devedition-nightly/opt
     - linux64-asan-reporter-nightly/opt
     - linux64/opt
+    - linux64-pgo/opt
     - macosx64-nightly/opt
     - macosx64-devedition-nightly/opt
     - macosx64/opt
     - win32-nightly/opt
     - win32-devedition-nightly/opt
     - win32/opt
+    - win32-pgo/opt
     - win64-nightly/opt
     - win64-devedition-nightly/opt
     - win64-aarch64-nightly/opt
     - win64/opt
+    - win64-pgo/opt
     - win64-asan-reporter-nightly/opt
 
 job-template:

taskcluster/taskgraph/loader/build_signing.py

@@ -13,7 +13,8 @@ NON_NIGHTLY_LABELS_WHICH_SHOULD_SIGN_BUILDS = (
     'build-win64/debug', 'build-win64/opt', 'build-win64/pgo',
     'build-win32-devedition/opt', 'build-win64-devedition/opt',
     'build-win64-ccov/debug',
-    'build-linux/opt', 'build-linux64/opt', 'build-macosx64/opt',
+    'build-linux/opt', 'build-linux64/opt', 'build-linux64/pgo',
+    'build-macosx64/opt',
     'build-android-api-16/opt'
     'release-source-linux64-source/opt',
     'release-source-linux64-fennec-source/opt',

taskcluster/taskgraph/transforms/l10n.py

@@ -282,6 +282,7 @@ def handle_artifact_prefix(config, jobs):
 def all_locales_attribute(config, jobs):
     for job in jobs:
         locales_platform = job['attributes']['build_platform'].replace("-nightly", "")
+        locales_platform = locales_platform.replace("-pgo", "")
         locales_with_changesets = parse_locales_file(job["locales-file"],
                                                      platform=locales_platform)
         locales_with_changesets = _remove_locales(locales_with_changesets,

taskcluster/taskgraph/transforms/repackage.py

@@ -222,8 +222,7 @@ def make_job_description(config, jobs):
             treeherder.setdefault('symbol', 'Nr')
         else:
             treeherder.setdefault('symbol', 'Rpk')
-        dep_th_platform = dep_job.task.get('extra', {}).get(
-            'treeherder', {}).get('machine', {}).get('platform', '')
+        dep_th_platform = dep_job.task.get('extra', {}).get('treeherder-platform')
         treeherder.setdefault('platform', "{}/opt".format(dep_th_platform))
         treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')

taskcluster/taskgraph/transforms/repackage_signing.py

@@ -51,8 +51,7 @@ def make_repackage_signing_description(config, jobs):
             treeherder.setdefault('symbol', 'rs(N)')
         else:
             treeherder.setdefault('symbol', 'rs(B)')
-        dep_th_platform = dep_job.task.get('extra', {}).get(
-            'treeherder', {}).get('machine', {}).get('platform', '')
+        dep_th_platform = dep_job.task.get('extra', {}).get('treeherder-platform')
         treeherder.setdefault('platform',
                               "{}/opt".format(dep_th_platform))
         treeherder.setdefault(