Bug 1497860: Move mozconfig variant definitions to taskcluster config. r=ted, a=release
authorTom Prince <mozilla@hocat.ca>
Wed, 24 Oct 2018 00:52:23 +0300
changeset 500808 3c3beb416a0e5e6530f6551a0b2ad3c48394c218
parent 500807 c7d638d18847747e9dd767852ca0bc61024f2ee5
child 500809 9185ecc725220ff44c3b20c85c421e44abdf3439
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, release
bugs1497860
milestone64.0
Bug 1497860: Move mozconfig variant definitions to taskcluster config. r=ted, a=release Differential Revision: https://phabricator.services.mozilla.com/D8452
taskcluster/ci/build/android-stuff.yml
taskcluster/ci/build/android.yml
taskcluster/ci/build/kind.yml
taskcluster/ci/build/linux.yml
taskcluster/ci/build/macosx.yml
taskcluster/ci/build/windows.yml
taskcluster/ci/static-analysis-autotest/kind.yml
taskcluster/taskgraph/transforms/build.py
testing/mozharness/configs/builds/branch_specifics.py
testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_devedition.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_opt.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_devedition.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_plain_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_plain_opt.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_tup.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_debug.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_noopt_debug.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_devedition.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_devedition.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang_debug.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_devedition.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang_debug.py
testing/mozharness/configs/builds/taskcluster_sub_win32/addondevel.py
testing/mozharness/configs/builds/taskcluster_sub_win32/debug.py
testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py
testing/mozharness/configs/builds/taskcluster_sub_win32/opt.py
testing/mozharness/configs/builds/taskcluster_sub_win32/rusttests_opt.py
testing/mozharness/configs/builds/taskcluster_sub_win64/addondevel.py
testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py
testing/mozharness/configs/builds/taskcluster_sub_win64/asan_opt.py
testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_debug.py
testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py
testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py
testing/mozharness/configs/builds/taskcluster_sub_win64/opt.py
testing/mozharness/configs/builds/taskcluster_sub_win64/plain_debug.py
testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/taskcluster/ci/build/android-stuff.yml
+++ b/taskcluster/ci/build/android-stuff.yml
@@ -1,8 +1,12 @@
+job-defaults:
+    run:
+        mozconfig-variant: null
+
 android-test/opt:
     description: "Android armv7 unit tests"
     index:
         product: mobile
         job-name: android-test
     treeherder:
         platform: android-4-0-armv7-api16/opt
         kind: build
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -1,8 +1,12 @@
+job-defaults:
+    run:
+        mozconfig-variant: null
+
 android-api-16/debug:
     description: "Android 4.0 api-16+ Debug"
     index:
         product: mobile
         job-name: android-api-16-debug
     attributes:
         enable-full-crashsymbols: true
     treeherder:
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -20,16 +20,25 @@ jobs-from:
     - android.yml
     - android-stuff.yml
     - linux.yml
     - macosx.yml
     - windows.yml
 
 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:
                 nightly: nightly
                 beta:
                     by-shipping-product:
                         devedition: aurora
                         default: beta
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -41,22 +41,25 @@ linux64-plain/opt:
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 3600
         env:
             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
         - linux64-clang
         - linux64-rust
         - linux64-node
         - linux64-cbindgen
 
@@ -111,16 +114,17 @@ linux64-fuzzing/debug:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         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:
         - linux64-clang
         - linux64-gcc
         - linux64-cbindgen
         - linux64-sccache
         - linux64-rust
@@ -144,16 +148,17 @@ linux64/debug:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: debug
+        mozconfig-variant: debug
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-cbindgen
         - linux64-sccache
         - linux64-rust
@@ -171,20 +176,23 @@ linux64-plain/debug:
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 3600
         env:
             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]
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-node
@@ -209,21 +217,23 @@ linux64-devedition-nightly/opt:
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - 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
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
@@ -279,16 +289,17 @@ linux64-base-toolchains/debug:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: debug
+        mozconfig-variant: debug
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-clang-3.9
         - linux64-gcc-6
         - linux64-rust-1.29
         - linux64-cbindgen
         - linux64-sccache
@@ -345,16 +356,17 @@ linux/debug:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_32_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: debug
+        mozconfig-variant: debug
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
@@ -414,16 +426,17 @@ linux-rusttests/opt:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_32_builds.py
         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
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
@@ -450,16 +463,17 @@ linux-rusttests/debug:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_32_builds.py
         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
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
@@ -487,21 +501,23 @@ linux-devedition-nightly/opt:
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - 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
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
@@ -562,16 +578,17 @@ linux64-asan/opt:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         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:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
@@ -595,16 +612,17 @@ linux64-asan-fuzzing/opt:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         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:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
@@ -628,18 +646,17 @@ linux64-asan-fuzzing-ccov/opt:
     run:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - 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:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
@@ -664,18 +681,17 @@ linux64-fuzzing-ccov/opt:
     run:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - 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:
         - linux64-clang
         - linux64-gcc
         - linux64-cbindgen
         - linux64-rust
         - linux64-rust-size
@@ -703,16 +719,17 @@ linux64-asan-reporter-nightly/opt:
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
             - taskcluster_nightly.py
         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:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
@@ -736,16 +753,17 @@ linux64-asan/debug:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         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:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
@@ -805,16 +823,17 @@ linux64-noopt/debug:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         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
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
@@ -841,16 +860,17 @@ linux64-rusttests/opt:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         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
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
@@ -876,16 +896,17 @@ linux64-rusttests/debug:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         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
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
@@ -910,16 +931,17 @@ linux64-tup/opt:
         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
         custom-build-variant-cfg: tup
+        mozconfig-variant: tup
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust-nightly
         - linux64-cbindgen
         - linux64-sccache
@@ -945,16 +967,17 @@ linux64-ccov/debug:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         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:
         - linux64-clang-7
         - linux64-rust-nightly
         - linux64-gcc
         - linux64-cbindgen
         - linux64-sccache
@@ -979,16 +1002,17 @@ linux64-ccov/opt:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         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:
         - linux64-clang-7
         - linux64-rust-nightly
         - linux64-gcc
         - linux64-cbindgen
         - linux64-sccache
@@ -1010,16 +1034,17 @@ linux64-add-on-devel/opt:
         using: mozharness
         actions: [get-secrets build check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         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']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -18,16 +18,17 @@ macosx64/debug:
         using: mozharness
         actions: [get-secrets build]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_mac_64_cross_builds.py
         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
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-macos
@@ -91,16 +92,17 @@ macosx64-asan-fuzzing/opt:
         using: mozharness
         actions: [get-secrets build]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_mac_64_cross_builds.py
         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
         - linux64-clang-macosx-cross
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-macos
@@ -131,20 +133,22 @@ macosx64-devedition-nightly/opt:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
         actions: [get-secrets build]
         config:
             - 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
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-macos
@@ -171,16 +175,17 @@ macosx64-noopt/debug:
         using: mozharness
         actions: [get-secrets build]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_mac_64_cross_builds.py
         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']
     toolchains:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
@@ -209,16 +214,17 @@ macosx64-add-on-devel/opt:
         using: mozharness
         actions: [get-secrets build]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_mac_64_cross_builds.py
         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:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
@@ -288,16 +294,17 @@ macosx64-ccov/debug:
         using: mozharness
         actions: [get-secrets build]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_mac_64_cross_builds.py
         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:
         - linux64-cctools-port
         - linux64-clang-macosx-cross
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -18,16 +18,17 @@ win32/debug:
         using: mozharness
         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_win32.py
             - builds/taskcluster_sub_win32/debug.py
+        mozconfig-variant: debug
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
@@ -50,17 +51,18 @@ win32/opt:
     run:
         using: mozharness
         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_win32.py
-            - builds/taskcluster_sub_win32/opt.py
+        extra-config:
+            stage_platform: win32
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
@@ -83,17 +85,18 @@ win32/pgo:
     run:
         using: mozharness
         options: [enable-pgo, 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_win32.py
-            - builds/taskcluster_sub_win32/opt.py
+        extra-config:
+            stage_platform: win32
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
@@ -117,16 +120,17 @@ win64/debug:
         using: mozharness
         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/debug.py
+        mozconfig-variant: debug
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
@@ -148,17 +152,20 @@ win64-plain/debug:
     run:
         using: mozharness
         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_debug.py
+        extra-config:
+            disable_package_metrics: true
+            stage_platform: win64
+        mozconfig-variant: plain-debug
     run-on-projects: [trunk]
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-node
         - win64-cbindgen
 
 win64/opt:
@@ -180,17 +187,18 @@ win64/opt:
     run:
         using: mozharness
         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/opt.py
+        extra-config:
+            stage_platform: win64
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
@@ -206,23 +214,27 @@ win64-plain/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: plain
             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
         - win64-rust
         - win64-node
         - win64-cbindgen
 
 win32-nightly/opt:
@@ -256,18 +268,19 @@ win32-nightly/opt:
         using: mozharness
         actions: [build, check-test]
         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_win32.py
-            - builds/taskcluster_sub_win32/opt.py
             - taskcluster_nightly.py
+        extra-config:
+            stage_platform: win32
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
@@ -295,18 +308,19 @@ win64-nightly/opt:
         using: mozharness
         actions: [build, check-test]
         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/opt.py
             - taskcluster_nightly.py
+        extra-config:
+            stage_platform: win64
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
@@ -329,17 +343,18 @@ win64/pgo:
     run:
         using: mozharness
         options: [enable-pgo, 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/opt.py
+        extra-config:
+            stage_platform: win64
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
@@ -360,17 +375,19 @@ win32-add-on-devel/opt:
     run:
         using: mozharness
         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_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
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
@@ -392,17 +409,19 @@ win64-add-on-devel/opt:
     run:
         using: mozharness
         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/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
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
@@ -425,16 +444,17 @@ win64-noopt/debug:
         using: mozharness
         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/noopt_debug.py
+        mozconfig-variant: noopt-debug
     run-on-projects: ['trunk', 'try']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
@@ -457,16 +477,17 @@ win32-noopt/debug:
         using: mozharness
         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_win32.py
             - builds/taskcluster_sub_win32/noopt_debug.py
+        mozconfig-variant: noopt-debug
     run-on-projects: ['trunk', 'try']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
@@ -489,17 +510,20 @@ win32-rusttests/opt:
     run:
         using: mozharness
         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_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
         - win64-rust
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
@@ -522,16 +546,17 @@ win64-rusttests/opt:
         using: mozharness
         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/rusttests_opt.py
+        mozconfig-variant: rusttests
     run-on-projects: ['trunk', 'try']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
@@ -553,16 +578,17 @@ win64-ccov/debug:
         using: mozharness
         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/ccov_debug.py
+        mozconfig-variant: code-coverage
     run-on-projects: ['mozilla-central', 'try']
     toolchains:
         - win64-clang-cl
         - win64-rust-nightly
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
@@ -586,16 +612,17 @@ win64-asan/debug:
         using: mozharness
         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/asan_debug.py
+        mozconfig-variant: debug-asan
     run-on-projects: ['trunk', 'try']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
@@ -618,17 +645,19 @@ win64-asan/opt:
     run:
         using: mozharness
         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/asan_opt.py
+        extra-config:
+            stage_platform: win64-asan
+        mozconfig-variant: nightly-asan
     run-on-projects: ['trunk', 'try']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
@@ -655,16 +684,19 @@ win64-asan-reporter-nightly/opt:
         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/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
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
@@ -699,19 +731,20 @@ win32-devedition-nightly/opt:
     run:
         using: mozharness
         script: mozharness/scripts/fx_desktop_build.py
         options: [enable-pgo, append-env-variables-from-configs]
         config:
             - 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
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
@@ -739,19 +772,20 @@ win64-devedition-nightly/opt:
     run:
         using: mozharness
         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/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
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-node
@@ -775,18 +809,17 @@ win32-msvc/debug:
         using: mozharness
         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_win32.py
             - builds/taskcluster_sub_win32/debug.py
-        extra-config:
-            mozconfig_variant: 'debug-msvc'
+        mozconfig-variant: debug-msvc
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
 win32-msvc/opt:
@@ -807,19 +840,19 @@ win32-msvc/opt:
     run:
         using: mozharness
         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_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
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
 win64-msvc/debug:
@@ -841,18 +874,17 @@ win64-msvc/debug:
         using: mozharness
         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/debug.py
-        extra-config:
-            mozconfig_variant: 'debug-msvc'
+        mozconfig-variant: debug-msvc
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
 win64-msvc/opt:
@@ -873,19 +905,19 @@ win64-msvc/opt:
     run:
         using: mozharness
         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/opt.py
         extra-config:
-            mozconfig_variant: 'opt-msvc'
+            stage_platform: win64
+        mozconfig-variant: opt-msvc
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
 win32-mingwclang/opt:
@@ -906,16 +938,17 @@ win32-mingwclang/opt:
     run:
         using: mozharness
         actions: [build]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - 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
         - linux64-upx
         - linux64-wine
         - linux64-sccache
         - linux64-cbindgen
         - linux64-node
@@ -941,17 +974,17 @@ win32-mingwclang/debug:
     run:
         using: mozharness
         actions: [build]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - 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
         - linux64-upx
         - linux64-wine
         - linux64-sccache
         - linux64-cbindgen
         - linux64-node
@@ -977,16 +1010,17 @@ win64-mingwclang/opt:
     run:
         using: mozharness
         actions: [build]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - 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
         - linux64-upx
         - linux64-wine
         - linux64-sccache
         - linux64-cbindgen
         - linux64-node
@@ -1012,17 +1046,17 @@ win64-mingwclang/debug:
     run:
         using: mozharness
         actions: [build]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - 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
         - linux64-upx
         - linux64-wine
         - linux64-sccache
         - linux64-cbindgen
         - linux64-node
--- a/taskcluster/ci/static-analysis-autotest/kind.yml
+++ b/taskcluster/ci/static-analysis-autotest/kind.yml
@@ -71,15 +71,17 @@ jobs:
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
         run:
             config:
                 - builds/releng_base_firefox.py
                 - builds/taskcluster_base_windows.py
                 - builds/taskcluster_base_win64.py
                 - builds/taskcluster_sub_win64/debug.py
+            extra-config:
+                mozconfig_variant: debug
         toolchains:
             - win64-clang-cl
             - win64-rust
             - win64-sccache
             - win64-cbindgen
             - win64-clang-tidy
             - win64-node
--- a/taskcluster/taskgraph/transforms/build.py
+++ b/taskcluster/taskgraph/transforms/build.py
@@ -63,16 +63,31 @@ def update_channel(config, jobs):
         )
         update_channel = job['run'].pop('update-channel', None)
         if update_channel:
             job['run'].setdefault('extra-config', {})['update_channel'] = update_channel
         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."""
     env = []
     if config.params['try_mode'] == 'try_option_syntax':
         env = config.params['try_options']['env'] or []
     for job in jobs:
         if env:
             job['worker']['env'].update(dict(x.split('=') for x in env))
--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@@ -31,80 +31,26 @@ config = {
     ### release branches
     "mozilla-central": {
         "repo_path": 'mozilla-central',
     },
     'mozilla-release': {
         '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',
         'branch_supports_uploadsymbols': False,
     },
 
     ### project branches
     #'fx-team': {},   #Bug 1296396
@@ -130,31 +76,14 @@ config = {
     # 'build-system': {}
     'cedar': {},
     'elm': {},
     'fig': {},
     'graphics': {},
     # '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': {},
     'oak': {},
     'pine': {},
 }
--- a/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
@@ -45,11 +45,10 @@ config = {
         # 32 bit specific
         'PATH': '/usr/local/bin:/bin:/usr/bin',
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux/minidump_stackwalk',
         '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,16 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'debug_build': True,
     'stage_platform': 'linux-debug',
     #### 32 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
@@ -18,11 +13,10 @@ config = {
         'LC_ALL': 'C',
         # 32 bit specific
         'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:',
         'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TINDERBOX_OUTPUT': '1',
     },
-    'mozconfig_variant': 'debug',
     #######################
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_devedition.py
+++ /dev/null
@@ -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,16 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux-rusttests',
     #### 32 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
--- 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,16 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'debug_build': True,
     'stage_platform': 'linux-rusttests-debug',
     #### 32 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
@@ -18,12 +13,11 @@ config = {
         'LC_ALL': 'C',
         # 32 bit specific
         'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
         'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
         '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,26 +1,20 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-add-on-devel',
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         ## 64 bit specific
         '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,16 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-asan-reporter',
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
@@ -19,11 +14,10 @@ config = {
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         'ASAN_OPTIONS': 'detect_leaks=0',
         ## 64 bit specific
         '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,27 +1,21 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-asan',
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         ## 64 bit specific
         '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,16 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-asan-debug',
     'debug_build': True,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
@@ -18,11 +13,10 @@ config = {
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         ## 64 bit specific
         '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,27 +1,21 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-ccov',
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         ## 64 bit specific
         '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,27 +1,21 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-ccov',
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         ## 64 bit specific
         '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,16 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-debug',
     'debug_build': True,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
@@ -18,11 +13,10 @@ config = {
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         # 64 bit specific
         'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
         'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
         'TINDERBOX_OUTPUT': '1',
     },
-    'mozconfig_variant': 'debug',
     #######################
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_devedition.py
+++ /dev/null
@@ -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,16 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-fuzzing-asan',
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
@@ -19,11 +14,10 @@ config = {
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         'ASAN_OPTIONS': 'detect_leaks=0',
         ## 64 bit specific
         '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,16 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-fuzzing-debug',
     'debug_build': True,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
@@ -19,11 +14,10 @@ config = {
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         # 64 bit specific
         'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
         '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,26 +1,20 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-noopt-debug',
     'debug_build': True,
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         # 64 bit specific
         'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
         'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
         'TINDERBOX_OUTPUT': '1',
     },
-    'mozconfig_variant': 'noopt-debug',
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_plain_debug.py
+++ /dev/null
@@ -1,7 +0,0 @@
-config = {
-    'default_actions': [
-        'build',
-    ],
-    'disable_package_metrics': True,
-    'mozconfig_variant': 'plain-debug',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_plain_opt.py
+++ /dev/null
@@ -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,28 +1,22 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-rusttests',
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         ## 64 bit specific
         '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,27 +1,21 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'linux64-rusttests-debug',
     'debug_build': True,
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         # 64 bit specific
         'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
         '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,17 +1,12 @@
 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',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
@@ -20,12 +15,11 @@ config = {
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
         'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
         'TINDERBOX_OUTPUT': '1',
 
         # sccache doesn't work yet with tup due to the way the server is
         # 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,27 +1,21 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'macosx64-add-on-devel',
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         ## 64 bit specific
         'PATH': '/tools/python/bin:/opt/local/bin:/usr/bin:'
                 '/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,16 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-    ],
     'stage_platform': 'macosx64-ccov-debug',
     'debug_build': True,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
@@ -18,11 +13,10 @@ config = {
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         ## 64 bit specific
         'PATH': '/tools/python/bin:/opt/local/bin:/usr/bin:'
                 '/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,14 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'build',
-    ],
     'stage_platform': 'macosx64-debug',
     'debug_build': True,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
@@ -17,12 +14,11 @@ config = {
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         ## 64 bit specific
         'PATH': '/tools/python/bin:/opt/local/bin:/usr/bin:'
                 '/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,14 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'build',
-    ],
     'stage_platform': 'macosx64-fuzzing-asan',
     'publish_nightly_en_US_routes': False,
     'platform_supports_post_upload_to_latest': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
@@ -18,11 +15,10 @@ config = {
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         'ASAN_OPTIONS': 'detect_leaks=0',
         ## 64 bit specific
         '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,15 +1,11 @@
 import os
 
 config = {
-    'default_actions': [
-        'clobber',
-        'build',
-    ],
     'stage_platform': 'macosx64-noopt-debug',
     'debug_build': True,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
@@ -18,12 +14,11 @@ config = {
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         ## 64 bit specific
         'PATH': '/tools/python/bin:/opt/local/bin:/usr/bin:'
                 '/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
         ##
     },
-    'mozconfig_variant': 'cross-noopt-debug',
     'artifact_flag_build_variant_in_try': 'cross-debug-artifact',
     #######################
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_devedition.py
+++ /dev/null
@@ -1,5 +0,0 @@
-config = {
-    'mozconfig_variant': 'devedition',
-    'stage_platform': 'macosx64-devedition',
-
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_devedition.py
+++ /dev/null
@@ -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
@@ -1,6 +1,5 @@
 config = {
     'platform': 'win32-mingwclang',
     'stage_platform': 'win32-mingwclang',
     'mozconfig_platform': 'win32',
-    'mozconfig_variant': 'mingwclang',
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang_debug.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
-    'mozconfig_variant': 'mingwclang-debug',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_devedition.py
+++ /dev/null
@@ -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
@@ -1,6 +1,5 @@
 config = {
     'platform': 'win64-mingwclang',
     'stage_platform': 'win64-mingwclang',
     'mozconfig_platform': 'win64',
-    'mozconfig_variant': 'mingwclang',
 }
deleted file mode 100755
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang_debug.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
-    'mozconfig_variant': 'mingwclang-debug',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_sub_win32/addondevel.py
+++ /dev/null
@@ -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
@@ -1,8 +1,7 @@
 config = {
     'stage_platform': 'win32-debug',
     'debug_build': True,
     '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
@@ -1,9 +1,8 @@
 config = {
     'stage_platform': 'win32-noopt-debug',
     'debug_build': True,
     'env': {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     },
-    'mozconfig_variant': 'noopt-debug',
     'artifact_flag_build_variant_in_try': None,
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_sub_win32/opt.py
+++ /dev/null
@@ -1,8 +0,0 @@
-config = {
-    'default_actions': [
-        'build',
-        'check-test',
-    ],
-    'stage_platform': 'win32',
-    'mozconfig_variant': 'nightly',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_sub_win32/rusttests_opt.py
+++ /dev/null
@@ -1,5 +0,0 @@
-config = {
-    'stage_platform': 'win32-rusttests',
-    'mozconfig_variant': 'rusttests',
-    'artifact_flag_build_variant_in_try': None,
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/addondevel.py
+++ /dev/null
@@ -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
@@ -1,8 +1,7 @@
 config = {
     'stage_platform': 'win64-asan-debug',
     'debug_build': True,
     'env': {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     },
-    'mozconfig_variant': 'debug-asan',
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_opt.py
+++ /dev/null
@@ -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
@@ -1,9 +1,7 @@
 config = {
     'stage_platform': 'win64-ccov',
     'debug_build': True,
     '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
@@ -1,8 +1,7 @@
 config = {
     'stage_platform': 'win64-debug',
     'debug_build': True,
     '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
@@ -1,9 +1,8 @@
 config = {
     'stage_platform': 'win64-noopt-debug',
     'debug_build': True,
     'env': {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     },
-    'mozconfig_variant': 'noopt-debug',
     'artifact_flag_build_variant_in_try': None,
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/opt.py
+++ /dev/null
@@ -1,8 +0,0 @@
-config = {
-    'default_actions': [
-        'build',
-        'check-test',
-    ],
-    'stage_platform': 'win64',
-    'mozconfig_variant': 'nightly',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/plain_debug.py
+++ /dev/null
@@ -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
@@ -1,8 +1,7 @@
 config = {
     'stage_platform': 'win64-rusttests',
     '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
@@ -388,17 +388,16 @@ class BuildOptionParser(object):
         'android-test-ccov': 'builds/releng_sub_%s_configs/%s_test_ccov.py',
         'android-checkstyle': 'builds/releng_sub_%s_configs/%s_checkstyle.py',
         'android-lint': 'builds/releng_sub_%s_configs/%s_lint.py',
         'android-findbugs': 'builds/releng_sub_%s_configs/%s_findbugs.py',
         'android-geckoview-docs': 'builds/releng_sub_%s_configs/%s_geckoview_docs.py',
         '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'
     branch_cfg_file = 'builds/branch_specifics.py'
 
     @classmethod
     def _query_pltfrm_and_bits(cls, target_option, options):
         """ determine platform and bits