Bug 1560164 - Pull out common variables in instrumented-build/kind.yml; r=tomprince

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

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

taskcluster/ci/instrumented-build/kind.yml

@@ -17,31 +17,33 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 job-defaults:
+    shipping-phase: build
     treeherder:
         symbol: Bpgo(instr)
         tier: 1
+    worker:
+        max-run-time: 7200
+        env:
+            PERFHERDER_EXTRA_OPTIONS: instrumented
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        script: mozharness/scripts/fx_desktop_build.py
+        secrets: true
 
 jobs:
     linux-shippable/opt:
         description: "Linux Instrumented"
-        shipping-phase: build
         shipping-product: firefox
         treeherder:
             platform: linux32-shippable/opt
         worker-type: b-linux
         worker:
-            max-run-time: 7200
             docker-image: {in-tree: debian7-i386-build}
-            env:
-                PERFHERDER_EXTRA_OPTIONS: instrumented
         run:
-            using: mozharness
-            actions: [get-secrets, build]
             config:
                 - builds/releng_base_firefox.py
                 - builds/releng_base_linux_32_builds.py
-            script: "mozharness/scripts/fx_desktop_build.py"
-            secrets: true
             mozconfig-variant: profile-generate
             tooltool-downloads: public
             need-xvfb: true
@@ -57,23 +59,14 @@ jobs:
 
     linux64-shippable/opt:
         description: "Linux64 Instrumented"
-        shipping-phase: build
         shipping-product: firefox
         treeherder:
             platform: linux64-shippable/opt
         worker-type: b-linux
-        worker:
-            max-run-time: 7200
-            env:
-                PERFHERDER_EXTRA_OPTIONS: instrumented
         run:
-            using: mozharness
-            actions: [get-secrets, build]
             config:
                 - builds/releng_base_firefox.py
                 - builds/releng_base_linux_64_builds.py
-            script: "mozharness/scripts/fx_desktop_build.py"
-            secrets: true
             mozconfig-variant: profile-generate
             tooltool-downloads: public
             need-xvfb: true
@@ -89,20 +82,15 @@ jobs:
 
     android-api-16/pgo:
         description: "Android 4.0 api-16+ PGO instrumented"
-        shipping-phase: build
         shipping-product: fennec
-        attributes:
-            enable-full-crashsymbols: true
         treeherder:
             platform: android-4-0-armv7-api16/pgo
         worker-type: b-linux
         worker:
             docker-image: {in-tree: android-build}
-            max-run-time: 7200
             env:
                 GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
                 TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
-                PERFHERDER_EXTRA_OPTIONS: instrumented
             artifacts:
                 - name: public/build
                   path: /builds/worker/artifacts/
@@ -114,12 +102,8 @@ jobs:
                   path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
                   type: file
         run:
-            using: mozharness
-            actions: [get-secrets, build]
             config:
                 - builds/releng_base_android_64_builds.py
-            script: "mozharness/scripts/fx_desktop_build.py"
-            secrets: true
             custom-build-variant-cfg: api-16-profile-generate
             tooltool-downloads: internal
         toolchains:
@@ -136,25 +120,16 @@ jobs:
 
     win32-shippable/opt:
         description: "Win32 Shippable PGO Instrumented"
-        attributes:
-            enable-full-crashsymbols: true
-        shipping-phase: build
         shipping-product: firefox
         treeherder:
             platform: windows2012-32-shippable/opt
         worker-type: b-win2012
         worker:
-            max-run-time: 7200
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
-                PERFHERDER_EXTRA_OPTIONS: instrumented
         run:
-            using: mozharness
-            actions: [get-secrets, build]
             use-caches: false
             options: [append-env-variables-from-configs]
-            script: mozharness/scripts/fx_desktop_build.py
-            secrets: true
             mozconfig-variant: profile-generate
             config:
                 - builds/releng_base_firefox.py
@@ -172,25 +147,16 @@ jobs:
 
     win64-shippable/opt:
         description: "Win64 Shippable PGO Instrumented"
-        attributes:
-            enable-full-crashsymbols: true
-        shipping-phase: build
         shipping-product: firefox
         treeherder:
             platform: windows2012-64-shippable/opt
         worker-type: b-win2012
         worker:
-            max-run-time: 7200
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
-                PERFHERDER_EXTRA_OPTIONS: instrumented
         run:
-            using: mozharness
-            actions: [get-secrets, build]
             use-caches: false
             options: [append-env-variables-from-configs]
-            script: mozharness/scripts/fx_desktop_build.py
-            secrets: true
             mozconfig-variant: profile-generate
             config:
                 - builds/releng_base_firefox.py