Bug 1497860: Move mozconfig variant definitions to taskcluster config. r=ted

Differential Revision: https://phabricator.services.mozilla.com/D8452 --HG-- extra : moz-landing-system : lando
2024-10-16 06:45:42 +00:00 · 2018-10-23 21:27:42 +00:00 · 2018-10-23 21:27:42 +00:00 · 56fdb45c78
commit 56fdb45c78
parent 71f6f27866
57 changed files with 134 additions and 320 deletions
--- a/taskcluster/ci/build/android-stuff.yml
+++ b/taskcluster/ci/build/android-stuff.yml
@ -1,3 +1,7 @@
+job-defaults:
+    run:
+        mozconfig-variant: null
+
 android-test/opt:
    description: "Android armv7 unit tests"
    index:
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@ -1,3 +1,7 @@
+job-defaults:
+    run:
+        mozconfig-variant: null
+
 android-api-16/debug:
    description: "Android 4.0 api-16+ Debug"
    index:
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@ -25,6 +25,15 @@ jobs-from:

 job-defaults:
    run:
+        mozconfig-variant:
+            by-release-type:
+                beta: beta
+                release.*: release
+                # We keep using the release configs as the beta and release configs are
+                # identical except for
+                # https://searchfox.org/mozilla-central/rev/ce9ff94ffed34dc17ec0bfa406156d489eaa8ee1/browser/config/mozconfigs/linux32/release#1    # noqa
+                esr.*: release
+                default: nightly
        # Note: These settings are only honored by nightly (i.e. shipping) builds
        update-channel:
            by-release-type:
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@ -46,12 +46,15 @@ linux64-plain/opt:
            PERFHERDER_EXTRA_OPTIONS: plain
    run:
        using: mozharness
+        actions: [build]
        config:
            - builds/releng_base_firefox.py
            - builds/releng_base_linux_64_builds.py
-            - builds/releng_sub_linux_configs/64_plain_opt.py
        script: mozharness/scripts/fx_desktop_build.py
        tooltool-downloads: public
+        extra-config:
+            disable_package_metrics: true
+        mozconfig-variant: plain-opt
    run-on-projects: [trunk]
    toolchains:
        - linux64-binutils
@ -116,6 +119,7 @@ linux64-fuzzing/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: fuzzing-debug
+        mozconfig-variant: debug-fuzzing
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -149,6 +153,7 @@ linux64/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: debug
+        mozconfig-variant: debug
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -176,10 +181,13 @@ linux64-plain/debug:
            PERFHERDER_EXTRA_OPTIONS: plain
    run:
        using: mozharness
+        actions: [build]
        config:
            - builds/releng_base_firefox.py
            - builds/releng_base_linux_64_builds.py
-            - builds/releng_sub_linux_configs/64_plain_debug.py
+        extra-config:
+            disable_package_metrics: true
+        mozconfig-variant: plain-debug
        script: mozharness/scripts/fx_desktop_build.py
        tooltool-downloads: public
    run-on-projects: [trunk]
@ -214,11 +222,13 @@ linux64-devedition-nightly/opt:
            - builds/releng_base_firefox.py
            - builds/releng_base_linux_64_builds.py
            - taskcluster_nightly.py
+        extra-config:
+            stage_platform: 'linux64-devedition'
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        tooltool-downloads: public
        need-xvfb: true
-        custom-build-variant-cfg: devedition
+        mozconfig-variant: devedition
    run-on-projects: ['mozilla-beta']
    toolchains:
        - linux64-binutils
@ -284,6 +294,7 @@ linux64-base-toolchains/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: debug
+        mozconfig-variant: debug
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -350,6 +361,7 @@ linux/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: debug
+        mozconfig-variant: debug
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -419,6 +431,7 @@ linux-rusttests/opt:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: rusttests
+        mozconfig-variant: rusttests
        tooltool-downloads: public
        keep-artifacts: false
        need-xvfb: true
@ -455,6 +468,7 @@ linux-rusttests/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: rusttests-debug
+        mozconfig-variant: rusttests-debug
        tooltool-downloads: public
        keep-artifacts: false
        need-xvfb: true
@ -492,11 +506,13 @@ linux-devedition-nightly/opt:
            - builds/releng_base_firefox.py
            - builds/releng_base_linux_32_builds.py
            - taskcluster_nightly.py
+        extra-config:
+            stage_platform: linux-devedition
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        tooltool-downloads: public
        need-xvfb: true
-        custom-build-variant-cfg: devedition
+        mozconfig-variant: devedition
    run-on-projects: ['mozilla-beta']
    toolchains:
        - linux64-binutils
@ -567,6 +583,7 @@ linux64-asan/opt:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: asan-tc
+        mozconfig-variant: nightly-asan
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -600,6 +617,7 @@ linux64-asan-fuzzing/opt:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: fuzzing-asan-tc
+        mozconfig-variant: nightly-fuzzing-asan
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -633,8 +651,7 @@ linux64-asan-fuzzing-ccov/opt:
            - builds/releng_base_linux_64_builds.py
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
-        extra-config:
-            mozconfig_variant: 'asan-fuzzing-ccov'
+        mozconfig-variant: asan-fuzzing-ccov
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -669,8 +686,7 @@ linux64-fuzzing-ccov/opt:
            - builds/releng_base_linux_64_builds.py
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
-        extra-config:
-            mozconfig_variant: 'fuzzing-ccov'
+        mozconfig-variant: fuzzing-ccov
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -708,6 +724,7 @@ linux64-asan-reporter-nightly/opt:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: asan-reporter-tc
+        mozconfig-variant: nightly-asan-reporter
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -741,6 +758,7 @@ linux64-asan/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: asan-tc-and-debug
+        mozconfig-variant: debug-asan
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -810,6 +828,7 @@ linux64-noopt/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: noopt-debug
+        mozconfig-variant: noopt-debug
        tooltool-downloads: public
        keep-artifacts: false
        need-xvfb: true
@ -846,6 +865,7 @@ linux64-rusttests/opt:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: rusttests
+        mozconfig-variant: rusttests
        tooltool-downloads: public
        keep-artifacts: false
        need-xvfb: true
@ -881,6 +901,7 @@ linux64-rusttests/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: rusttests-debug
+        mozconfig-variant: rusttests-debug
        tooltool-downloads: public
        keep-artifacts: false
        need-xvfb: true
@ -915,6 +936,7 @@ linux64-tup/opt:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: tup
+        mozconfig-variant: tup
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -950,6 +972,7 @@ linux64-ccov/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: code-coverage-debug
+        mozconfig-variant: code-coverage-debug
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -984,6 +1007,7 @@ linux64-ccov/opt:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: code-coverage-opt
+        mozconfig-variant: code-coverage-opt
        tooltool-downloads: public
        need-xvfb: true
    toolchains:
@ -1015,6 +1039,7 @@ linux64-add-on-devel/opt:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: add-on-devel
+        mozconfig-variant: add-on-devel
        tooltool-downloads: public
        need-xvfb: true
    run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@ -23,6 +23,7 @@ macosx64/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: cross-debug
+        mozconfig-variant: debug
        tooltool-downloads: internal
    toolchains:
        - linux64-cctools-port
@ -96,6 +97,7 @@ macosx64-asan-fuzzing/opt:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: cross-fuzzing-asan
+        mozconfig-variant: nightly-fuzzing-asan
        tooltool-downloads: internal
    toolchains:
        - linux64-cctools-port
@ -136,10 +138,12 @@ macosx64-devedition-nightly/opt:
            - builds/releng_base_firefox.py
            - builds/releng_base_mac_64_cross_builds.py
            - taskcluster_nightly.py
+        extra-config:
+            stage_platform: macosx64-devedition
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        tooltool-downloads: internal
-        custom-build-variant-cfg: devedition
+        mozconfig-variant: devedition
    run-on-projects: ['mozilla-beta']
    toolchains:
        - linux64-cctools-port
@ -176,6 +180,7 @@ macosx64-noopt/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: cross-noopt-debug
+        mozconfig-variant: cross-noopt-debug
        tooltool-downloads: internal
        keep-artifacts: false
    run-on-projects: ['trunk', 'try']
@ -214,6 +219,7 @@ macosx64-add-on-devel/opt:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: add-on-devel
+        mozconfig-variant: add-on-devel
        tooltool-downloads: internal
    run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
    toolchains:
@ -293,6 +299,7 @@ macosx64-ccov/debug:
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: code-coverage-debug
+        mozconfig-variant: code-coverage-debug
        tooltool-downloads: internal
    run-on-projects: ['try']
    toolchains:
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@ -23,6 +23,7 @@ win32/debug:
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win32.py
            - builds/taskcluster_sub_win32/debug.py
+        mozconfig-variant: debug
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -55,7 +56,8 @@ win32/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win32.py
-            - builds/taskcluster_sub_win32/opt.py
+        extra-config:
+            stage_platform: win32
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -88,7 +90,8 @@ win32/pgo:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win32.py
-            - builds/taskcluster_sub_win32/opt.py
+        extra-config:
+            stage_platform: win32
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -122,6 +125,7 @@ win64/debug:
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
            - builds/taskcluster_sub_win64/debug.py
+        mozconfig-variant: debug
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -153,7 +157,10 @@ win64-plain/debug:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/plain_debug.py
+        extra-config:
+            disable_package_metrics: true
+            stage_platform: win64
+        mozconfig-variant: plain-debug
    run-on-projects: [trunk]
    toolchains:
        - win64-clang-cl
@ -185,7 +192,8 @@ win64/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/opt.py
+        extra-config:
+            stage_platform: win64
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -211,13 +219,17 @@ win64-plain/opt:
            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
    run:
        using: mozharness
+        actions: [build]
        options: [append-env-variables-from-configs]
        script: mozharness/scripts/fx_desktop_build.py
        config:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/plain_opt.py
+        extra-config:
+            disable_package_metrics: true
+            stage_platform: win64
+        mozconfig-variant: plain-opt
    run-on-projects: [trunk]
    toolchains:
        - win64-clang-cl
@ -261,8 +273,9 @@ win32-nightly/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win32.py
-            - builds/taskcluster_sub_win32/opt.py
            - taskcluster_nightly.py
+        extra-config:
+            stage_platform: win32
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -300,8 +313,9 @@ win64-nightly/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/opt.py
            - taskcluster_nightly.py
+        extra-config:
+            stage_platform: win64
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -334,7 +348,8 @@ win64/pgo:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/opt.py
+        extra-config:
+            stage_platform: win64
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -365,7 +380,9 @@ win32-add-on-devel/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win32.py
-            - builds/taskcluster_sub_win32/addondevel.py
+        extra-config:
+            stage_platform: win32-add-on-devel
+        mozconfig-variant: add-on-devel
    run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
    toolchains:
        - win64-clang-cl
@ -397,7 +414,9 @@ win64-add-on-devel/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/addondevel.py
+        extra-config:
+            stage_platform: win64-on-devel
+        mozconfig-variant: add-on-devel
    run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
    toolchains:
        - win64-clang-cl
@ -430,6 +449,7 @@ win64-noopt/debug:
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
            - builds/taskcluster_sub_win64/noopt_debug.py
+        mozconfig-variant: noopt-debug
    run-on-projects: ['trunk', 'try']
    toolchains:
        - win64-clang-cl
@ -462,6 +482,7 @@ win32-noopt/debug:
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win32.py
            - builds/taskcluster_sub_win32/noopt_debug.py
+        mozconfig-variant: noopt-debug
    run-on-projects: ['trunk', 'try']
    toolchains:
        - win64-clang-cl
@ -494,7 +515,10 @@ win32-rusttests/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win32.py
-            - builds/taskcluster_sub_win32/rusttests_opt.py
+        extra-config:
+            stage_platform: win32-rusttests
+            artifact_flag_build_variant_in_try: null
+        mozconfig-variant: rusttests
    run-on-projects: ['trunk', 'try']
    toolchains:
        - win64-clang-cl
@ -527,6 +551,7 @@ win64-rusttests/opt:
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
            - builds/taskcluster_sub_win64/rusttests_opt.py
+        mozconfig-variant: rusttests
    run-on-projects: ['trunk', 'try']
    toolchains:
        - win64-clang-cl
@ -558,6 +583,7 @@ win64-ccov/debug:
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
            - builds/taskcluster_sub_win64/ccov_debug.py
+        mozconfig-variant: code-coverage
    run-on-projects: ['mozilla-central', 'try']
    toolchains:
        - win64-clang-cl
@ -591,6 +617,7 @@ win64-asan/debug:
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
            - builds/taskcluster_sub_win64/asan_debug.py
+        mozconfig-variant: debug-asan
    run-on-projects: ['trunk', 'try']
    toolchains:
        - win64-clang-cl
@ -623,7 +650,9 @@ win64-asan/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/asan_opt.py
+        extra-config:
+            stage_platform: win64-asan
+        mozconfig-variant: nightly-asan
    run-on-projects: ['trunk', 'try']
    toolchains:
        - win64-clang-cl
@ -660,6 +689,9 @@ win64-asan-reporter-nightly/opt:
            - builds/taskcluster_base_win64.py
            - builds/taskcluster_sub_win64/asan_reporter_opt.py
            - taskcluster_nightly.py
+        extra-config:
+            stage_platform: win64-asan-reporter
+        mozconfig-variant: nightly-asan-reporter
    run-on-projects: ['mozilla-central']
    toolchains:
        - win64-clang-cl
@ -704,9 +736,10 @@ win32-devedition-nightly/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win32.py
-            - builds/taskcluster_sub_win32/opt.py
            - taskcluster_nightly.py
-        custom-build-variant-cfg: devedition
+        extra-config:
+            stage_platform: win32-devedition
+        mozconfig-variant: devedition
    run-on-projects: ['mozilla-beta']
    toolchains:
        - win64-clang-cl
@ -744,9 +777,10 @@ win64-devedition-nightly/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/opt.py
            - taskcluster_nightly.py
-        custom-build-variant-cfg: devedition
+        extra-config:
+            stage_platform: win64-devedition
+        mozconfig-variant: devedition
    run-on-projects: ['mozilla-beta']
    toolchains:
        - win64-clang-cl
@ -780,8 +814,7 @@ win32-msvc/debug:
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win32.py
            - builds/taskcluster_sub_win32/debug.py
-        extra-config:
-            mozconfig_variant: 'debug-msvc'
+        mozconfig-variant: debug-msvc
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -812,9 +845,9 @@ win32-msvc/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win32.py
-            - builds/taskcluster_sub_win32/opt.py
        extra-config:
-            mozconfig_variant: 'opt-msvc'
+            stage_platform: win32
+        mozconfig-variant: opt-msvc
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -846,8 +879,7 @@ win64-msvc/debug:
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
            - builds/taskcluster_sub_win64/debug.py
-        extra-config:
-            mozconfig_variant: 'debug-msvc'
+        mozconfig-variant: debug-msvc
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -878,9 +910,9 @@ win64-msvc/opt:
            - builds/releng_base_firefox.py
            - builds/taskcluster_base_windows.py
            - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/opt.py
        extra-config:
-            mozconfig_variant: 'opt-msvc'
+            stage_platform: win64
+        mozconfig-variant: opt-msvc
    toolchains:
        - win64-clang-cl
        - win64-rust
@ -911,6 +943,7 @@ win32-mingwclang/opt:
            - builds/releng_base_firefox.py
            - builds/releng_base_windows_32_mingw_builds.py
            - builds/releng_sub_windows_configs/32_mingwclang.py
+        mozconfig-variant: mingwclang
        need-xvfb: false
    toolchains:
        - mingw32-rust
@ -946,7 +979,7 @@ win32-mingwclang/debug:
            - builds/releng_base_firefox.py
            - builds/releng_base_windows_32_mingw_builds.py
            - builds/releng_sub_windows_configs/32_mingwclang.py
-            - builds/releng_sub_windows_configs/32_mingwclang_debug.py
+        mozconfig-variant: mingwclang-debug
        need-xvfb: false
    toolchains:
        - mingw32-rust
@ -982,6 +1015,7 @@ win64-mingwclang/opt:
            - builds/releng_base_firefox.py
            - builds/releng_base_windows_64_mingw_builds.py
            - builds/releng_sub_windows_configs/64_mingwclang.py
+        mozconfig-variant: mingwclang
        need-xvfb: false
    toolchains:
        - mingw32-rust
@ -1017,7 +1051,7 @@ win64-mingwclang/debug:
            - builds/releng_base_firefox.py
            - builds/releng_base_windows_64_mingw_builds.py
            - builds/releng_sub_windows_configs/64_mingwclang.py
-            - builds/releng_sub_windows_configs/64_mingwclang_debug.py
+        mozconfig-variant: mingwclang-debug
        need-xvfb: false
    toolchains:
        - mingw32-rust
--- a/taskcluster/ci/static-analysis-autotest/kind.yml
+++ b/taskcluster/ci/static-analysis-autotest/kind.yml
@ -76,6 +76,7 @@ jobs:
                - builds/taskcluster_base_windows.py
                - builds/taskcluster_base_win64.py
                - builds/taskcluster_sub_win64/debug.py
+            mozconfig-variant: debug
        toolchains:
            - win64-clang-cl
            - win64-rust
--- a/taskcluster/taskgraph/transforms/build.py
+++ b/taskcluster/taskgraph/transforms/build.py
@ -67,6 +67,21 @@ def update_channel(config, jobs):
        yield job


+@transforms.add
+def mozconfig(config, jobs):
+    for job in jobs:
+        resolve_keyed_by(
+            job, 'run.mozconfig-variant', item_name=job['name'],
+            **{
+                'release-type': config.params['release_type'],
+            }
+        )
+        mozconfig_variant = job['run'].pop('mozconfig-variant', None)
+        if mozconfig_variant:
+            job['run'].setdefault('extra-config', {})['mozconfig_variant'] = mozconfig_variant
+        yield job
+
+
@transforms.add
 def set_env(config, jobs):
    """Set extra environment variables from try command line."""
--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@ -36,70 +36,16 @@ config = {
        'enable_release_promotion': True,
        'repo_path': 'releases/mozilla-release',
        'branch_uses_per_checkin_strategy': True,
-        'platform_overrides': {
-            'linux': {
-                'mozconfig_variant': 'release',
-            },
-            'linux64': {
-                'mozconfig_variant': 'release',
-            },
-            'macosx64': {
-                'mozconfig_variant': 'release',
-            },
-            'win32': {
-                'mozconfig_variant': 'release',
-            },
-            'win64': {
-                'mozconfig_variant': 'release',
-            },
-        },
    },
    'mozilla-esr60': {
        'enable_release_promotion': True,
        'repo_path': 'releases/mozilla-esr60',
        'branch_uses_per_checkin_strategy': True,
-        'platform_overrides': {
-            'linux': {
-                # We keep using the release configs as the beta and release configs are
-                # identical except for
-                # https://searchfox.org/mozilla-central/rev/ce9ff94ffed34dc17ec0bfa406156d489eaa8ee1/browser/config/mozconfigs/linux32/release#1    # noqa
-                'mozconfig_variant': 'release',
-            },
-            'linux64': {
-                'mozconfig_variant': 'release',
-            },
-            'macosx64': {
-                'mozconfig_variant': 'release',
-            },
-            'win32': {
-                'mozconfig_variant': 'release',
-            },
-            'win64': {
-                'mozconfig_variant': 'release',
-            },
-        },
    },
    'mozilla-beta': {
        'enable_release_promotion': 1,
        'repo_path': 'releases/mozilla-beta',
        'branch_uses_per_checkin_strategy': True,
-        'platform_overrides': {
-            'linux': {
-                'mozconfig_variant': 'beta',
-            },
-            'linux64': {
-                'mozconfig_variant': 'beta',
-            },
-            'macosx64': {
-                'mozconfig_variant': 'beta',
-            },
-            'win32': {
-                'mozconfig_variant': 'beta',
-            },
-            'win64': {
-                'mozconfig_variant': 'beta',
-            },
-        },
    },
    'try': {
        'repo_path': 'try',
@ -135,23 +81,6 @@ config = {
    # 'holly': {},
    'jamun': {
        'enable_release_promotion': 1,
-        'platform_overrides': {
-            'linux': {
-                'mozconfig_variant': 'release',
-            },
-            'linux64': {
-                'mozconfig_variant': 'release',
-            },
-            'macosx64': {
-                'mozconfig_variant': 'release',
-            },
-            'win32': {
-                'mozconfig_variant': 'release',
-            },
-            'win64': {
-                'mozconfig_variant': 'release',
-            },
-        },
    },
    'larch': {},
    # 'maple': {},
--- a/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
@ -50,6 +50,5 @@ config = {
        'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',
    },
    'mozconfig_platform': 'win32',
-    'mozconfig_variant': 'mingw32',
    #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'debug_build': True,
    'stage_platform': 'linux-debug',
    #### 32 bit build specific #####
@ -23,6 +18,5 @@ config = {
        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
        'TINDERBOX_OUTPUT': '1',
    },
-    'mozconfig_variant': 'debug',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_devedition.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_devedition.py
@ -1,4 +0,0 @@
-config = {
-    'mozconfig_variant': 'devedition',
-    'stage_platform': 'linux-devedition',
-}
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux-rusttests',
    #### 32 bit build specific #####
    'env': {
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'debug_build': True,
    'stage_platform': 'linux-rusttests-debug',
    #### 32 bit build specific #####
@ -23,7 +18,6 @@ config = {
        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
        'TINDERBOX_OUTPUT': '1',
    },
-    'mozconfig_variant': 'rusttests-debug',
    'artifact_flag_build_variant_in_try': None,
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-add-on-devel',
    #### 64 bit build specific #####
    'env': {
@ -21,6 +16,5 @@ config = {
        'PATH': '/builds/worker/workspace/build/src/gcc/bin:/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
    },
-    'mozconfig_variant': 'add-on-devel',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-asan-reporter',
    #### 64 bit build specific #####
    'env': {
@ -24,6 +19,5 @@ config = {
        'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
    },
-    'mozconfig_variant': 'nightly-asan-reporter',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-asan',
    #### 64 bit build specific #####
    'env': {
@ -22,6 +17,5 @@ config = {
        'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
    },
-    'mozconfig_variant': 'nightly-asan',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-asan-debug',
    'debug_build': True,
    #### 64 bit build specific #####
@ -23,6 +18,5 @@ config = {
        'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
    },
-    'mozconfig_variant': 'debug-asan',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_debug.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-ccov',
    #### 64 bit build specific #####
    'env': {
@ -22,6 +17,5 @@ config = {
        'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
    },
-    'mozconfig_variant': 'code-coverage-debug',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_opt.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_opt.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-ccov',
    #### 64 bit build specific #####
    'env': {
@ -22,6 +17,5 @@ config = {
        'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
    },
-    'mozconfig_variant': 'code-coverage-opt',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-debug',
    'debug_build': True,
    #### 64 bit build specific #####
@ -23,6 +18,5 @@ config = {
        'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
        'TINDERBOX_OUTPUT': '1',
    },
-    'mozconfig_variant': 'debug',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_devedition.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_devedition.py
@ -1,4 +0,0 @@
-config = {
-    'mozconfig_variant': 'devedition',
-    'stage_platform': 'linux64-devedition',
-}
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-fuzzing-asan',
    #### 64 bit build specific #####
    'env': {
@ -24,6 +19,5 @@ config = {
        'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
    },
-    'mozconfig_variant': 'nightly-fuzzing-asan',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-fuzzing-debug',
    'debug_build': True,
    #### 64 bit build specific #####
@ -24,6 +19,5 @@ config = {
        'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
        'TINDERBOX_OUTPUT': '1',
    },
-    'mozconfig_variant': 'debug-fuzzing',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-noopt-debug',
    'debug_build': True,
    'env': {
@ -22,5 +17,4 @@ config = {
        'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
        'TINDERBOX_OUTPUT': '1',
    },
-    'mozconfig_variant': 'noopt-debug',
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_plain_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_plain_debug.py
@ -1,7 +0,0 @@
-config = {
-    'default_actions': [
-        'build',
-    ],
-    'disable_package_metrics': True,
-    'mozconfig_variant': 'plain-debug',
-}
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_plain_opt.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_plain_opt.py
@ -1,7 +0,0 @@
-config = {
-    'default_actions': [
-        'build',
-    ],
-    'disable_package_metrics': True,
-    'mozconfig_variant': 'plain-opt',
-}
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-rusttests',
    #### 64 bit build specific #####
    'env': {
@ -22,7 +17,6 @@ config = {
        'PATH': ':/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
    },
-    'mozconfig_variant': 'rusttests',
    'artifact_flag_build_variant_in_try': None,
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'linux64-rusttests-debug',
    'debug_build': True,
    'env': {
@ -22,6 +17,5 @@ config = {
        'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
        'TINDERBOX_OUTPUT': '1',
    },
-    'mozconfig_variant': 'rusttests-debug',
    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_tup.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_tup.py
@ -1,12 +1,7 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-    ],
    'stage_platform': 'linux64-tup-opt',
-    'enable_talos_sendchange': False,
    'env': {
        'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
        'DISPLAY': ':2',
@ -25,7 +20,6 @@ config = {
        # spawned, and because the server does the file I/O
        'SCCACHE_DISABLE': '1',
    },
-    'mozconfig_variant': 'tup',
    'disable_package_metrics': True, # TODO: the package needs to be created for this to work
    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'macosx64-add-on-devel',
    #### 64 bit build specific #####
    'env': {
@ -22,6 +17,5 @@ config = {
                '/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
        ##
    },
-    'mozconfig_variant': 'add-on-devel',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_debug.py
@ -1,11 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
    'stage_platform': 'macosx64-ccov-debug',
    'debug_build': True,
    #### 64 bit build specific #####
@ -23,6 +18,5 @@ config = {
                '/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
        ##
    },
-    'mozconfig_variant': 'code-coverage-debug',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
@ -1,9 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'build',
-    ],
    'stage_platform': 'macosx64-debug',
    'debug_build': True,
    #### 64 bit build specific #####
@ -22,7 +19,6 @@ config = {
                '/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
        ##
    },
-    'mozconfig_variant': 'debug',
    'artifact_flag_build_variant_in_try': 'cross-debug-artifact',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py
@ -1,9 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'build',
-    ],
    'stage_platform': 'macosx64-fuzzing-asan',
    'publish_nightly_en_US_routes': False,
    'platform_supports_post_upload_to_latest': False,
@ -23,6 +20,5 @@ config = {
        'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
    },
-    'mozconfig_variant': 'nightly-fuzzing-asan',
    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_noopt_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_noopt_debug.py
@ -1,10 +1,6 @@
 import os

 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-    ],
    'stage_platform': 'macosx64-noopt-debug',
    'debug_build': True,
    #### 64 bit build specific #####
@ -23,7 +19,6 @@ config = {
                '/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
        ##
    },
-    'mozconfig_variant': 'cross-noopt-debug',
    'artifact_flag_build_variant_in_try': 'cross-debug-artifact',
    #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_devedition.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_devedition.py
@ -1,5 +0,0 @@
-config = {
-    'mozconfig_variant': 'devedition',
-    'stage_platform': 'macosx64-devedition',
-
-}
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_devedition.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_devedition.py
@ -1,4 +0,0 @@
-config = {
-    'mozconfig_variant': 'devedition',
-    'stage_platform': 'win32-devedition',
-}
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang.py
@ -2,5 +2,4 @@ config = {
    'platform': 'win32-mingwclang',
    'stage_platform': 'win32-mingwclang',
    'mozconfig_platform': 'win32',
-    'mozconfig_variant': 'mingwclang',
 }
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang_debug.py
@ -1,3 +0,0 @@
-config = {
-    'mozconfig_variant': 'mingwclang-debug',
-}
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_devedition.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_devedition.py
@ -1,4 +0,0 @@
-config = {
-    'mozconfig_variant': 'devedition',
-    'stage_platform': 'win64-devedition',
-}
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang.py
@ -2,5 +2,4 @@ config = {
    'platform': 'win64-mingwclang',
    'stage_platform': 'win64-mingwclang',
    'mozconfig_platform': 'win64',
-    'mozconfig_variant': 'mingwclang',
 }
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang_debug.py
@ -1,3 +0,0 @@
-config = {
-    'mozconfig_variant': 'mingwclang-debug',
-}
--- a/testing/mozharness/configs/builds/taskcluster_sub_win32/addondevel.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win32/addondevel.py
@ -1,4 +0,0 @@
-config = {
-    'stage_platform': 'win32-add-on-devel',
-    'mozconfig_variant': 'add-on-devel',
-}
--- a/testing/mozharness/configs/builds/taskcluster_sub_win32/debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win32/debug.py
@ -4,5 +4,4 @@ config = {
    'env': {
        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
    },
-    'mozconfig_variant': 'debug',
 }
--- a/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py
@ -4,6 +4,5 @@ config = {
    'env': {
        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
    },
-    'mozconfig_variant': 'noopt-debug',
    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/taskcluster_sub_win32/opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win32/opt.py
@ -1,8 +0,0 @@
-config = {
-    'default_actions': [
-        'build',
-        'check-test',
-    ],
-    'stage_platform': 'win32',
-    'mozconfig_variant': 'nightly',
-}
--- a/testing/mozharness/configs/builds/taskcluster_sub_win32/rusttests_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win32/rusttests_opt.py
@ -1,5 +0,0 @@
-config = {
-    'stage_platform': 'win32-rusttests',
-    'mozconfig_variant': 'rusttests',
-    'artifact_flag_build_variant_in_try': None,
-}
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/addondevel.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/addondevel.py
@ -1,4 +0,0 @@
-config = {
-    'stage_platform': 'win64-add-on-devel',
-    'mozconfig_variant': 'add-on-devel',
-}
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py
@ -4,5 +4,4 @@ config = {
    'env': {
        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
    },
-    'mozconfig_variant': 'debug-asan',
 }
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_opt.py
@ -1,4 +0,0 @@
-config = {
-    'stage_platform': 'win64-asan',
-    'mozconfig_variant': 'nightly-asan',
-}
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_debug.py
@ -4,6 +4,4 @@ config = {
    'env': {
        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
    },
-    'mozconfig_variant': 'code-coverage',
-    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py
@ -4,5 +4,4 @@ config = {
    'env': {
        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
    },
-    'mozconfig_variant': 'debug',
 }
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py
@ -4,6 +4,5 @@ config = {
    'env': {
        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
    },
-    'mozconfig_variant': 'noopt-debug',
    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/opt.py
@ -1,8 +0,0 @@
-config = {
-    'default_actions': [
-        'build',
-        'check-test',
-    ],
-    'stage_platform': 'win64',
-    'mozconfig_variant': 'nightly',
-}
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/plain_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/plain_debug.py
@ -1,8 +0,0 @@
-config = {
-    'default_actions': [
-        'build',
-    ],
-    'disable_package_metrics': True,
-    'mozconfig_variant': 'plain-debug',
-    'stage_platform': 'win64',
-}
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
@ -3,6 +3,5 @@ config = {
    'env': {
        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
    },
-    'mozconfig_variant': 'rusttests',
    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@ -393,7 +393,6 @@ class BuildOptionParser(object):
        'valgrind': 'builds/releng_sub_%s_configs/%s_valgrind.py',
        'artifact': 'builds/releng_sub_%s_configs/%s_artifact.py',
        'debug-artifact': 'builds/releng_sub_%s_configs/%s_debug_artifact.py',
-        'devedition': 'builds/releng_sub_%s_configs/%s_devedition.py',
        'tup': 'builds/releng_sub_%s_configs/%s_tup.py',
    }
    build_pool_cfg_file = 'builds/build_pool_specifics.py'