Bug 1356952 - Add tooltool manifests defined in mozharness configurations to taskcluster job definitions. r=mshal

Since bug 1321847, mozharness tooltool manifests can be overriden from the environment. We use that possibility to now define tooltool manifests from taskcluster job definitions. Ideally, we'd also remove the definitions from the mozharness configs, but with things still running on buildbot, it's not clear what things might break because of that. We'll do it in a separately back-out-able followup. --HG-- extra : rebase_source : 860b8f1d4fdc4a557770a3749055f19b1ec45e93
2024-10-22 01:35:35 +00:00 · 2017-06-06 16:17:40 +09:00 · 2017-06-06 16:17:40 +09:00 · b6397fae70
commit b6397fae70
parent 2b3fb6fd20
8 changed files with 155 additions and 38 deletions
--- a/taskcluster/ci/android-stuff/kind.yml
+++ b/taskcluster/ci/android-stuff/kind.yml
@ -40,6 +40,7 @@ jobs:
                    platform_supports_post_upload_to_latest.py
                MOZHARNESS_SCRIPT: "mozharness/scripts/fx_desktop_build.py"
                TOOLTOOL_CACHE: "/home/worker/tooltool-cache"
+                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-gradle-dependencies/releng.manifest"
            artifacts:
              - name: public/build
                path: /home/worker/artifacts/
@ -85,6 +86,7 @@ jobs:
                    disable_signing.py
                    platform_supports_post_upload_to_latest.py
                MOZHARNESS_SCRIPT: "mozharness/scripts/fx_desktop_build.py"
+                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-frontend/releng.manifest"
            artifacts:
              - name: public/android/unittest
                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/tests
@ -132,6 +134,7 @@ jobs:
                    disable_signing.py
                    platform_supports_post_upload_to_latest.py
                MOZHARNESS_SCRIPT: "mozharness/scripts/fx_desktop_build.py"
+                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-frontend/releng.manifest"
            artifacts:
              - name: public/android/lint/lint-results-officialAustralisDebug.html
                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialAustralisDebug.html
@ -201,6 +204,7 @@ jobs:
                    disable_signing.py
                    platform_supports_post_upload_to_latest.py
                MOZHARNESS_SCRIPT: "mozharness/scripts/fx_desktop_build.py"
+                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-frontend/releng.manifest"
            artifacts:
              - name: public/android/checkstyle/checkstyle.xml
                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/checkstyle/checkstyle.xml
@ -251,6 +255,7 @@ jobs:
                    disable_signing.py
                    platform_supports_post_upload_to_latest.py
                MOZHARNESS_SCRIPT: "mozharness/scripts/fx_desktop_build.py"
+                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-frontend/releng.manifest"
            artifacts:
              - name: public/android/findbugs/findbugs-officialAustralisDebug-output.html
                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/findbugs/findbugs-officialAustralisDebug-output.html
--- a/taskcluster/ci/artifact-build/kind.yml
+++ b/taskcluster/ci/artifact-build/kind.yml
@ -24,6 +24,8 @@ jobs:
        worker:
            docker-image: {in-tree: desktop-build}
            max-run-time: 36000
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
        run:
            using: mozharness
            actions: [get-secrets build]
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@ -9,6 +9,8 @@ android-api-15/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
@ -32,6 +34,8 @@ android-x86/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
@ -58,6 +62,8 @@ android-x86-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
@ -82,6 +88,8 @@ android-api-15/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
@ -108,6 +116,8 @@ android-api-15-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
@ -132,6 +142,8 @@ android-x86-old-id/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
@ -159,6 +171,8 @@ android-x86-old-id-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
@ -184,6 +198,8 @@ android-api-15-old-id/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
@ -211,6 +227,8 @@ android-api-15-old-id-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
@ -240,6 +258,7 @@ android-api-15-gradle/opt:
        env:
            # Bug 1292762 - Set GRADLE_USER_HOME to avoid sdk-manager-plugin intermittent
            GRADLE_USER_HOME: /home/worker/workspace/build/src/dotgradle
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
        artifacts:
          - name: public/android/maven
            path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
@ -273,6 +292,8 @@ android-aarch64/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
@ -299,6 +320,8 @@ android-aarch64-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-android
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build multi-l10n update]
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@ -9,6 +9,8 @@ linux64/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -31,6 +33,8 @@ linux64/pgo:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    coalesce-name: linux64-pgo
    run:
        using: mozharness
@ -55,6 +59,8 @@ linux64/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -81,6 +87,8 @@ linux64-devedition-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -108,7 +116,7 @@ linux64-base-toolchains/opt:
        max-run-time: 36000
        env:
            PERFHERDER_EXTRA_OPTIONS: base-toolchains
-            TOOLTOOL_MANIFEST: browser/config/tooltool-manifests/linux64/base-toolchains.manifest
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/base-toolchains.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -133,7 +141,7 @@ linux64-base-toolchains/debug:
        max-run-time: 36000
        env:
            PERFHERDER_EXTRA_OPTIONS: base-toolchains
-            TOOLTOOL_MANIFEST: browser/config/tooltool-manifests/linux64/base-toolchains.manifest
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/base-toolchains.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -157,6 +165,8 @@ linux/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
    coalesce-name: opt_linux32
    run:
        using: mozharness
@ -180,6 +190,8 @@ linux/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
    coalesce-name: dbg_linux32
    run:
        using: mozharness
@ -204,6 +216,8 @@ linux/pgo:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
    coalesce-name: linux32-pgo
    run:
        using: mozharness
@ -231,6 +245,8 @@ linux-devedition-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -259,6 +275,8 @@ linux-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -284,6 +302,7 @@ linux64-asan/opt:
    worker:
        env:
            PERFHERDER_EXTRA_OPTIONS: "opt asan"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/asan.manifest"
        max-run-time: 36000
    run:
        using: mozharness
@ -310,6 +329,7 @@ linux64-asan-fuzzing/opt:
    worker:
        env:
            PERFHERDER_EXTRA_OPTIONS: asan-fuzzing
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/asan.manifest"
        max-run-time: 36000
    run:
        using: mozharness
@ -335,6 +355,7 @@ linux64-asan/debug:
    worker:
        env:
            PERFHERDER_EXTRA_OPTIONS: "debug asan"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/asan.manifest"
        max-run-time: 36000
    run:
        using: mozharness
@ -362,6 +383,8 @@ linux64-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -386,6 +409,8 @@ linux64-stylo/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 3600
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -411,6 +436,8 @@ linux64-stylo/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 3600
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -436,6 +463,8 @@ linux64-noopt/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 3600
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -463,6 +492,8 @@ linux64-jsdcov/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -488,6 +519,8 @@ linux64-ccov/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
@ -512,6 +545,8 @@ linux64-add-on-devel/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build check-test update]
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@ -10,6 +10,8 @@ macosx64/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build update]
@ -54,6 +56,8 @@ macosx64-noopt/debug:
    worker:
        docker-image: {in-tree: desktop-build}
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build update]
@ -79,6 +83,8 @@ macosx64-add-on-devel/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
    run:
       using: mozharness
       actions: [get-secrets build update]
@ -106,6 +112,8 @@ macosx64-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
    worker:
        max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
    run:
        using: mozharness
        actions: [get-secrets build update]
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@ -10,6 +10,8 @@ win32/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
    run:
        using: mozharness
        script: mozharness/scripts/fx_desktop_build.py
@ -28,6 +30,8 @@ win32/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
    run:
        using: mozharness
        script: mozharness/scripts/fx_desktop_build.py
@ -46,6 +50,8 @@ win32/pgo:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 9000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
    run:
        using: mozharness
        options: [enable-pgo]
@ -65,6 +71,8 @@ win64/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
    run:
        using: mozharness
        script: mozharness/scripts/fx_desktop_build.py
@ -83,6 +91,8 @@ win64/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
    run:
        using: mozharness
        script: mozharness/scripts/fx_desktop_build.py
@ -104,6 +114,8 @@ win64-nightly/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
    run:
        using: mozharness
        script: mozharness/scripts/fx_desktop_build.py
@ -124,6 +136,8 @@ win64/pgo:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 10800
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
    run:
        using: mozharness
        options: [enable-pgo]
@ -132,44 +146,48 @@ win64/pgo:
            - builds/taskcluster_firefox_windows_64_opt.py

 win32-add-on-devel/opt:
-      description: "Windows32 add-on-devel"
-      index:
-          product: firefox
-          job-name: win32-add-on-devel
-      treeherder:
-          platform: windows2012-32-add-on-devel/opt
-          symbol: tc(B)
-          tier: 2
-      worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
-      worker:
-          max-run-time: 10800
-      run:
-          using: mozharness
-          script: "mozharness/scripts/fx_desktop_build.py"
-          config:
-              - builds/taskcluster_firefox_windows_32_addondevel.py
-              - balrog/production.py
-      run-on-projects: [ 'mozilla-beta', 'mozilla-release', 'mozilla-esr45' ]
+    description: "Windows32 add-on-devel"
+    index:
+        product: firefox
+        job-name: win32-add-on-devel
+    treeherder:
+        platform: windows2012-32-add-on-devel/opt
+        symbol: tc(B)
+        tier: 2
+    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker:
+        max-run-time: 10800
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
+    run:
+        using: mozharness
+        script: "mozharness/scripts/fx_desktop_build.py"
+        config:
+            - builds/taskcluster_firefox_windows_32_addondevel.py
+            - balrog/production.py
+    run-on-projects: [ 'mozilla-beta', 'mozilla-release', 'mozilla-esr45' ]

 win64-add-on-devel/opt:
-     description: "Windows64 add-on-devel"
-     index:
-         product: firefox
-         job-name: win64-add-on-devel
-     treeherder:
-         platform: windows2012-64-add-on-devel/opt 
-         symbol: tc(B)
-         tier: 2
-     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012 
-     worker:
-         max-run-time: 10800
-     run:
-         using: mozharness
-         script: "mozharness/scripts/fx_desktop_build.py"
-         config:
-             - builds/taskcluster_firefox_windows_64_addondevel.py 
-             - balrog/production.py
-     run-on-projects: [ 'mozilla-beta', 'mozilla-release', 'mozilla-esr45' ]
+    description: "Windows64 add-on-devel"
+    index:
+        product: firefox
+        job-name: win64-add-on-devel
+    treeherder:
+        platform: windows2012-64-add-on-devel/opt
+        symbol: tc(B)
+        tier: 2
+    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker:
+        max-run-time: 10800
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
+    run:
+        using: mozharness
+        script: "mozharness/scripts/fx_desktop_build.py"
+        config:
+            - builds/taskcluster_firefox_windows_64_addondevel.py
+            - balrog/production.py
+    run-on-projects: [ 'mozilla-beta', 'mozilla-release', 'mozilla-esr45' ]

 win64-noopt/debug:
    description: "Win64 No-optimize Debug"
@ -183,6 +201,8 @@ win64-noopt/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
    run:
        using: mozharness
        script: mozharness/scripts/fx_desktop_build.py
@ -202,6 +222,8 @@ win32-noopt/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
    run:
        using: mozharness
        script: mozharness/scripts/fx_desktop_build.py
@ -221,6 +243,8 @@ win64-asan/debug:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/clang.manifest"
    run:
        using: mozharness
        script: mozharness/scripts/fx_desktop_build.py
@ -240,6 +264,8 @@ win64-asan/opt:
    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
    worker:
        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/clang.manifest"
    run:
        using: mozharness
        script: mozharness/scripts/fx_desktop_build.py
--- a/taskcluster/ci/static-analysis/kind.yml
+++ b/taskcluster/ci/static-analysis/kind.yml
@ -28,6 +28,8 @@ jobs:
        worker:
            docker-image: {in-tree: desktop-build}
            max-run-time: 36000
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
        run:
            using: mozharness
            actions: [build update]
@ -50,6 +52,8 @@ jobs:
        worker:
            docker-image: {in-tree: desktop-build}
            max-run-time: 36000
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
        run:
            using: mozharness
            actions: [build update]
@ -72,6 +76,8 @@ jobs:
        worker:
            docker-image: {in-tree: desktop-build}
            max-run-time: 36000
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/clang.manifest.centos6"
        run:
            using: mozharness
            actions: [build]
@ -92,6 +98,8 @@ jobs:
        worker:
            docker-image: {in-tree: desktop-build}
            max-run-time: 36000
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/clang.manifest.centos6"
        run:
            using: mozharness
            actions: [build]
@ -114,6 +122,8 @@ jobs:
        worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
        worker:
            max-run-time: 7200
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/clang.manifest"
        run:
            using: mozharness
            script: mozharness/scripts/fx_desktop_build.py
@ -132,6 +142,8 @@ jobs:
        worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
        worker:
            max-run-time: 7200
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/clang.manifest"
        run:
            using: mozharness
            script: mozharness/scripts/fx_desktop_build.py
@ -150,6 +162,8 @@ jobs:
        worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
        worker:
            max-run-time: 7200
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/clang.manifest"
        run:
            using: mozharness
            script: mozharness/scripts/fx_desktop_build.py
@ -168,6 +182,8 @@ jobs:
        worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
        worker:
            max-run-time: 7200
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/clang.manifest"
        run:
            using: mozharness
            script: mozharness/scripts/fx_desktop_build.py
--- a/taskcluster/ci/valgrind/kind.yml
+++ b/taskcluster/ci/valgrind/kind.yml
@ -24,6 +24,8 @@ jobs:
        worker:
            docker-image: {in-tree: desktop-build}
            max-run-time: 72000
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
        run:
            using: mozharness
            actions: [get-secrets build valgrind-test]