Bug 1530908 - Don't use different mozconfigs for artifact builds. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 06 Mar 2019 22:48:05 +0000
changeset 520608 0d70e7e3302091699c769aa75d7389b1b3c2b5a8
parent 520607 8afb91736f7015b605e1f7ecbe56e0edec514296
child 520609 3fd4fd359c05f3f17d4cc158190cdf8c312d5b9a
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1530908
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1530908 - Don't use different mozconfigs for artifact builds. r=chmanchester Artifact mozconfigs are not necessarily up-to-date wrt changes to the nightly mozconfigs, and all in all, shouldn't be much different from them. It's just better to use the nightly mozconfigs (or beta on beta, etc.) and make the mozconfigs themselves handle the few things that need to be different when the USE_ARTIFACT environment is set (which is now consistently set by taskcluster) This does have the side effect of turning builds that actually don't support artifact builds red when using --artifact on try, instead of having them silently not be artifact builds as currently happens. Depends on D21314 Differential Revision: https://phabricator.services.mozilla.com/D21315
browser/config/mozconfigs/linux32/artifact
browser/config/mozconfigs/linux32/debug-artifact
browser/config/mozconfigs/linux64/artifact
browser/config/mozconfigs/linux64/debug-artifact
browser/config/mozconfigs/macosx64/artifact
browser/config/mozconfigs/macosx64/debug-artifact
browser/config/mozconfigs/win32/artifact
browser/config/mozconfigs/win32/debug-artifact
browser/config/mozconfigs/win64-aarch64/artifact
browser/config/mozconfigs/win64-aarch64/debug-artifact
browser/config/mozconfigs/win64/artifact
browser/config/mozconfigs/win64/debug-artifact
build/mozconfig.common
build/mozconfig.common.override
mobile/android/config/mozconfigs/android-aarch64/debug-artifact
mobile/android/config/mozconfigs/android-api-16/debug-artifact
mobile/android/config/mozconfigs/android-api-16/nightly-artifact
mobile/android/config/mozconfigs/android-x86_64/debug-artifact
mobile/android/config/mozconfigs/common
taskcluster/ci/artifact-build/kind.yml
taskcluster/ci/build/windows.yml
testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_artifact.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_artifact.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_gradle_dependencies.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_lint.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_checkstyle.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_findbugs.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_lint.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_test_ccov.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_artifact.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug_artifact.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_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.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_searchfox_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_tup.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_artifact.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_artifact.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_searchfox.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_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_artifact.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_artifact.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug_artifact.py
testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py
testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py
testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
testing/mozharness/configs/builds/taskcluster_sub_win64/searchfox_debug.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
testing/mozharness/scripts/fx_desktop_build.py
deleted file mode 100644
--- a/browser/config/mozconfigs/linux32/artifact
+++ /dev/null
@@ -1,6 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
deleted file mode 100644
--- a/browser/config/mozconfigs/linux32/debug-artifact
+++ /dev/null
@@ -1,8 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-. "$topsrcdir/build/unix/mozconfig.linux32"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-
-ac_add_options --enable-debug
deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/artifact
+++ /dev/null
@@ -1,6 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/debug-artifact
+++ /dev/null
@@ -1,9 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-. "$topsrcdir/build/unix/mozconfig.linux"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-
-ac_add_options --enable-debug
-
deleted file mode 100644
--- a/browser/config/mozconfigs/macosx64/artifact
+++ /dev/null
@@ -1,9 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-# Needed to set SourceRepository in application.ini (used by Talos)
-export MOZILLA_OFFICIAL=1
-
-. "$topsrcdir/build/macosx/mozconfig.common"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
deleted file mode 100644
--- a/browser/config/mozconfigs/macosx64/debug-artifact
+++ /dev/null
@@ -1,8 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-. "$topsrcdir/build/macosx/mozconfig.common"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-
-ac_add_options --enable-debug
deleted file mode 100644
--- a/browser/config/mozconfigs/win32/artifact
+++ /dev/null
@@ -1,11 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-# Needed to set SourceRepository in application.ini (used by Talos)
-export MOZILLA_OFFICIAL=1
-
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win32/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
deleted file mode 100644
--- a/browser/config/mozconfigs/win32/debug-artifact
+++ /dev/null
@@ -1,10 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win32/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-
-ac_add_options --enable-debug
deleted file mode 100644
--- a/browser/config/mozconfigs/win64-aarch64/artifact
+++ /dev/null
@@ -1,12 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-# Needed to set SourceRepository in application.ini (used by Talos)
-export MOZILLA_OFFICIAL=1
-
-. "$topsrcdir/browser/config/mozconfigs/win64-aarch64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win64-aarch64/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
deleted file mode 100644
--- a/browser/config/mozconfigs/win64-aarch64/debug-artifact
+++ /dev/null
@@ -1,11 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-. "$topsrcdir/browser/config/mozconfigs/win64-aarch64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win64-aarch64/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-
-ac_add_options --enable-debug
deleted file mode 100644
--- a/browser/config/mozconfigs/win64/artifact
+++ /dev/null
@@ -1,12 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-# Needed to set SourceRepository in application.ini (used by Talos)
-export MOZILLA_OFFICIAL=1
-
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
deleted file mode 100644
--- a/browser/config/mozconfigs/win64/debug-artifact
+++ /dev/null
@@ -1,11 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-
-ac_add_options --enable-debug
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -5,16 +5,20 @@
 # Common mozconfig for official builds.
 #
 # Add options to this file that will be inherited by all in-tree mozconfigs.
 # This is useful for eg try builds with nondefault options that apply to all
 # architectures, though note that if you want to override options set in
 # another mozconfig file, you'll need to use mozconfig.common.override instead
 # of this file.
 
+if test -n "$USE_ARTIFACT"; then
+. "$topsrcdir/build/mozconfig.artifact.automation"
+fi
+
 mk_add_options AUTOCLOBBER=1
 
 ac_add_options --enable-crashreporter
 
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}
 
 ac_add_options --enable-js-shell
--- a/build/mozconfig.common.override
+++ b/build/mozconfig.common.override
@@ -4,8 +4,12 @@
 
 # Common mozconfig for all users
 #
 # Add options to this file that will be inherited by all in-tree mozconfigs.
 # This file is included at the *end* of the mozconfigs, and so may be used
 # to override anything done previously.
 #
 # The common expected usage is for try builds with nondefault options.
+
+if test -n "$USE_ARTIFACT"; then
+. "$topsrcdir/build/mozconfig.artifact"
+fi
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-aarch64/debug-artifact
+++ /dev/null
@@ -1,15 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-NO_CACHE=1
-NO_NDK=1
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-# Global options
-ac_add_options --enable-debug
-
-. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/nightly"
-
-. "$topsrcdir/build/mozconfig.artifact"
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-api-16/debug-artifact
+++ /dev/null
@@ -1,15 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-NO_CACHE=1
-NO_NDK=1
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-# Global options
-ac_add_options --enable-debug
-
-. "$topsrcdir/mobile/android/config/mozconfigs/android-api-16/nightly"
-
-. "$topsrcdir/build/mozconfig.artifact"
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-api-16/nightly-artifact
+++ /dev/null
@@ -1,12 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-NO_CACHE=1
-NO_NDK=1
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-. "$topsrcdir/mobile/android/config/mozconfigs/android-api-16/nightly"
-
-. "$topsrcdir/build/mozconfig.artifact"
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-x86_64/debug-artifact
+++ /dev/null
@@ -1,15 +0,0 @@
-. "$topsrcdir/build/mozconfig.artifact.automation"
-
-NO_CACHE=1
-NO_NDK=1
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-# Global options
-ac_add_options --enable-debug
-
-. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly"
-
-. "$topsrcdir/build/mozconfig.artifact"
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -1,14 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This file is included at the top of all native android mozconfigs
-if [ -z "$NO_NDK" ]; then
+if [ -z "$NO_NDK" -a -z "$USE_ARTIFACT" ]; then
   . "$topsrcdir/build/mozconfig.stylo"
 fi
 
 MOZ_AUTOMATION_L10N_CHECK=0
 . "$topsrcdir/build/mozconfig.common"
 
 # For Android builds in TaskCluster, the system image is Debian, and
 # we use the Java JRE/JDK from the system.  We use a custom clang for
@@ -20,17 +20,17 @@ HOST_CXX="$topsrcdir/clang/bin/clang++ -
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux"
 
 ac_add_options --with-gradle="$topsrcdir/android-gradle-dependencies/gradle-dist/bin/gradle"
 export GRADLE_MAVEN_REPOSITORIES="file://$topsrcdir/android-gradle-dependencies/google","file://$topsrcdir/android-gradle-dependencies/jcenter","file://$topsrcdir/android-gradle-dependencies/gradle-plugins"
 
-if [ -z "$NO_NDK" ]; then
+if [ -z "$NO_NDK" -a -z "$USE_ARTIFACT" ]; then
     # We use our own clang instead of the NDK's clang.
     CC="$topsrcdir/clang/bin/clang"
     CXX="$topsrcdir/clang/bin/clang++"
     ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
     # Enable static analysis plugin
     export ENABLE_CLANG_PLUGIN=1
 fi
 
--- a/taskcluster/ci/artifact-build/kind.yml
+++ b/taskcluster/ci/artifact-build/kind.yml
@@ -33,17 +33,17 @@ jobs:
                 PERFHERDER_EXTRA_OPTIONS: artifact
                 MOZ_ARTIFACT_TASK: {task-reference: '<linux64-opt>'}
                 USE_ARTIFACT: '1'
         run:
             using: mozharness
             actions: [get-secrets, build]
             config:
                 - builds/releng_base_firefox.py
-                - builds/releng_sub_linux_configs/64_artifact.py
+                - builds/releng_base_linux_64_builds.py
             script: "mozharness/scripts/fx_desktop_build.py"
             secrets: true
             tooltool-downloads: public
             need-xvfb: true
             keep-artifacts: false
         dependencies:
             linux64-opt: build-linux64/opt
         toolchains:
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -566,17 +566,16 @@ win32-rusttests/opt:
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
         extra-config:
             stage_platform: win32-rusttests
-            artifact_flag_build_variant_in_try: null
             build_targets: ['pre-export', 'export', 'recurse_rusttests']
             disable_package_metrics: true
         mozconfig-variant: rusttests
     run-on-projects: ['trunk', 'try']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-cbindgen
@@ -605,17 +604,16 @@ win32-rusttests/debug:
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
         extra-config:
             stage_platform: win32-rusttests
-            artifact_flag_build_variant_in_try: null
             build_targets: ['pre-export', 'export', 'recurse_rusttests']
             disable_package_metrics: true
         mozconfig-variant: rusttests-debug
     run-on-projects: ['trunk', 'try']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-cbindgen
--- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
@@ -47,11 +47,10 @@ config = {
         ##
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux64/minidump_stackwalk',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',
     },
     'mozconfig_platform': 'macosx64',
     'mozconfig_variant': 'nightly',
-    'artifact_flag_build_variant_in_try': 'cross-artifact',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py
@@ -1,6 +1,5 @@
 config = {
     'stage_platform': 'android-aarch64',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-aarch64/nightly',
     'multi_locale_config_platform': 'android',
-    'artifact_flag_build_variant_in_try': 'aarch64-artifact',
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_artifact.py
+++ /dev/null
@@ -1,6 +0,0 @@
-config = {
-    'stage_platform': 'android-aarch64',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-aarch64/nightly-artifact',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-aarch64/releng.manifest',
-    'multi_locale_config_platform': 'android',
-}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug.py
@@ -1,7 +1,6 @@
 config = {
     'stage_platform': 'android-aarch64-debug',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-aarch64/debug',
     'multi_locale_config_platform': 'android',
     'debug_build': True,
-    'artifact_flag_build_variant_in_try': 'aarch64-debug-artifact',
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug_artifact.py
+++ /dev/null
@@ -1,7 +0,0 @@
-config = {
-    'stage_platform': 'android-aarch64-debug',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-aarch64/debug-artifact',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-aarch64/releng.manifest',
-    'multi_locale_config_platform': 'android',
-    'debug_build': True,
-}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py
@@ -1,6 +1,5 @@
 config = {
     'stage_platform': 'android-api-16',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly',
     'multi_locale_config_platform': 'android',
-    'artifact_flag_build_variant_in_try': 'api-16-artifact',
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_artifact.py
+++ /dev/null
@@ -1,6 +0,0 @@
-config = {
-    'stage_platform': 'android-api-16',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly-artifact',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
-    'multi_locale_config_platform': 'android',
-}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug.py
@@ -1,7 +1,6 @@
 config = {
     'stage_platform': 'android-api-16-debug',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/debug',
     'multi_locale_config_platform': 'android',
     'debug_build': True,
-    'artifact_flag_build_variant_in_try': 'api-16-debug-artifact',
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_artifact.py
+++ /dev/null
@@ -1,7 +0,0 @@
-config = {
-    'stage_platform': 'android-api-16-debug',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/debug-artifact',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
-    'multi_locale_config_platform': 'android',
-    'debug_build': True,
-}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_gradle_dependencies.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_gradle_dependencies.py
@@ -4,11 +4,10 @@ config = {
     'multi_locale_config_platform': 'android',
      # gradle-dependencies doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'gradle-dependencies',
         ],
     ],
-    'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
     'max_build_output_timeout': 0,
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py
@@ -1,6 +1,5 @@
 config = {
     'stage_platform': 'android-api-16',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly-without-google-play-services',
     'multi_locale_config_platform': 'android',
-    'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_lint.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_lint.py
@@ -4,11 +4,10 @@ config = {
     'multi_locale_config_platform': 'android',
     # apilint doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'api-lint',
         ],
     ],
-    'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
     'max_build_output_timeout': 0,
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_checkstyle.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_checkstyle.py
@@ -4,11 +4,10 @@ config = {
     'multi_locale_config_platform': 'android',
     # checkstyle doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'checkstyle',
         ],
     ],
-    'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
     'max_build_output_timeout': 0,
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_findbugs.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_findbugs.py
@@ -4,11 +4,10 @@ config = {
     'multi_locale_config_platform': 'android',
     # findbugs doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'findbugs',
         ],
     ],
-    'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
     'max_build_output_timeout': 0,
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py
@@ -8,11 +8,10 @@ config = {
         ['android',
          'geckoview-docs',
          '--archive',
          '--upload', 'mozilla/geckoview',
          '--upload-branch', 'gh-pages/javadoc/{project}',
          '--upload-message', 'Update {project} javadoc to rev {revision}',
         ],
     ],
-    'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
     'max_build_output_timeout': 0,
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_lint.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_lint.py
@@ -4,11 +4,10 @@ config = {
     'multi_locale_config_platform': 'android',
     # lint doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'lint',
         ],
     ],
-    'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
     'max_build_output_timeout': 0,
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
@@ -4,11 +4,10 @@ config = {
     'multi_locale_config_platform': 'android',
     # unit tests don't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'test',
         ],
     ],
-    'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
     'max_build_output_timeout': 0,
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_test_ccov.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_test_ccov.py
@@ -4,11 +4,10 @@ config = {
     'multi_locale_config_platform': 'android',
     # unit tests don't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'test-ccov',
         ],
     ],
-    'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
     'max_build_output_timeout': 0,
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
@@ -1,5 +1,4 @@
 config = {
     'stage_platform': 'android-x86',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly',
-    'artifact_flag_build_variant_in_try': 'x86-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64.py
@@ -1,6 +1,5 @@
 config = {
     'stage_platform': 'android-x86_64',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86_64/nightly',
     'multi_locale_config_platform': 'android',
-    'artifact_flag_build_variant_in_try': 'x86_64-artifact',
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_artifact.py
+++ /dev/null
@@ -1,5 +0,0 @@
-config = {
-    'stage_platform': 'android-x86_64',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86_64/nightly-artifact',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
-}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug.py
@@ -1,7 +1,6 @@
 config = {
     'stage_platform': 'android-x86_64-debug',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86_64/debug',
     'multi_locale_config_platform': 'android',
     'debug_build': True,
-    'artifact_flag_build_variant_in_try': 'x86_64-debug-artifact',
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug_artifact.py
+++ /dev/null
@@ -1,6 +0,0 @@
-config = {
-    'stage_platform': 'android-x86_64-debug',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86_64/debug-artifact',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
-    'debug_build': True,
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_artifact.py
+++ /dev/null
@@ -1,5 +0,0 @@
-config = {
-    'stage_platform': 'android-x86',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly-artifact',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_artifact.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import os
-
-config = {
-    #########################################################################
-    ######## LINUX GENERIC CONFIG KEYS/VAlUES
-    # if you are updating this with custom 32 bit keys/values please add them
-    # below under the '32 bit specific' code block otherwise, update in this
-    # code block and also make sure this is synced with
-    # releng_base_linux_64_builds.py
-
-    # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
-    'default_actions': [
-        'build',
-    ],
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    'vcs_share_base': '/builds/hg-shared',
-    #########################################################################
-
-
-    #########################################################################
-    ###### 32 bit specific ######
-    'platform': 'linux',
-    'stage_platform': 'linux',
-    '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',
-        # 32 bit specific
-        'PATH': '/usr/local/bin:\
-/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:',
-    },
-    'mozconfig_variant': 'artifact',
-    #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug_artifact.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import os
-
-config = {
-    #########################################################################
-    ######## LINUX GENERIC CONFIG KEYS/VAlUES
-    # if you are updating this with custom 32 bit keys/values please add them
-    # below under the '32 bit specific' code block otherwise, update in this
-    # code block and also make sure this is synced with
-    # releng_base_linux_64_builds.py
-
-    # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
-    'default_actions': [
-        'build',
-    ],
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    'vcs_share_base': '/builds/hg-shared',
-    # debug specific
-    'debug_build': True,
-    # allows triggering of test jobs when --artifact try syntax is detected
-    #########################################################################
-
-
-    #########################################################################
-    ###### 32 bit specific ######
-    'platform': 'linux',
-    'stage_platform': 'linux-debug',
-    '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',
-        # debug-specific
-        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-        # 32 bit specific
-        'PATH': '/usr/local/bin:\
-/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
-    },
-    'mozconfig_variant': 'debug-artifact',
-    #########################################################################
-}
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
@@ -14,12 +14,11 @@ config = {
         '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',
     },
     'build_targets': ['pre-export', 'export', 'recurse_rusttests'],
     'mozconfig_variant': 'rusttests',
-    'artifact_flag_build_variant_in_try': None,
     'disable_package_metrics': True,
     #######################
 }
--- 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
@@ -14,12 +14,11 @@ config = {
         # 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',
     },
     'build_targets': ['pre-export', 'export', 'recurse_rusttests'],
-    'artifact_flag_build_variant_in_try': None,
     'disable_package_metrics': True,
     #######################
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import os
-
-config = {
-    # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
-    'default_actions': [
-        'build',
-    ],
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    'secret_files': [
-        {'filename': '/builds/gapi.data',
-         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
-         'min_scm_level': 1},
-        {'filename': '/builds/gls-gapi.data',
-         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gls-gapi.data',
-         'min_scm_level': 1},
-        {'filename': '/builds/sb-gapi.data',
-         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/sb-gapi.data',
-         'min_scm_level': 1},
-        {'filename': '/builds/mozilla-desktop-geoloc-api.key',
-         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
-         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
-    ],
-    'vcs_share_base': '/builds/hg-shared',
-    #########################################################################
-
-
-    #########################################################################
-    ###### 64 bit specific ######
-    'platform': 'linux64',
-    'stage_platform': 'linux64',
-    '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/worker/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',
-        ##
-    },
-    # This doesn't actually inherit from anything.
-    'mozconfig_platform': 'linux64',
-    'mozconfig_variant': 'artifact',
-    #######################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import os
-
-config = {
-    # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
-    'default_actions': [
-        'build',
-    ],
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    'vcs_share_base': '/builds/hg-shared',
-    # debug specific
-    'debug_build': True,
-    # allows triggering of test jobs when --artifact try syntax is detected
-    #########################################################################
-
-
-    #########################################################################
-    ###### 64 bit specific ######
-    'platform': 'linux64',
-    'stage_platform': 'linux64-debug',
-    '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',
-        # debug-specific
-        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-        ## 64 bit specific
-        'PATH': '/usr/local/bin:/bin:\
-/usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
-        ##
-    },
-    'mozconfig_variant': 'debug-artifact',
-    #######################
-}
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
@@ -13,12 +13,11 @@ config = {
         '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',
     },
     'build_targets': ['pre-export', 'export', 'recurse_rusttests'],
-    'artifact_flag_build_variant_in_try': None,
     'disable_package_metrics': True,
     #######################
 }
--- 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
@@ -13,11 +13,10 @@ config = {
         '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',
     },
     'build_targets': ['pre-export', 'export', 'recurse_rusttests'],
-    'artifact_flag_build_variant_in_try': None,
     'disable_package_metrics': True,
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py
@@ -31,11 +31,9 @@ config = {
         ## 64 bit specific
         'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
         ##
     },
     # This doesn't actually inherit from anything.
     'mozconfig_platform': 'linux64',
     'mozconfig_variant': 'debug-searchfox-clang',
-    #######################
-    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
@@ -28,11 +28,9 @@ config = {
         ## 64 bit specific
         'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
         ##
     },
     # This doesn't actually inherit from anything.
     'mozconfig_platform': 'linux64',
     'mozconfig_variant': 'debug-static-analysis-clang',
-    #######################
-    '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
@@ -16,10 +16,9 @@ config = {
         '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',
     },
     '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_linux_configs/64_valgrind.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
@@ -19,11 +19,9 @@ config = {
         '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': 'valgrind',
-    #######################
-    'artifact_flag_build_variant_in_try': None,
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_artifact.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import os
-
-config = {
-    #########################################################################
-    ######## MACOSX GENERIC CONFIG KEYS/VAlUES
-
-    'default_actions': [
-        'build',
-    ],
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    'vcs_share_base': '/builds/hg-shared',
-    #########################################################################
-
-
-    #########################################################################
-    ###### 64 bit specific ######
-    'platform': 'macosx64',
-    'stage_platform': 'macosx64',
-    'env': {
-        'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
-        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        'MOZ_OBJDIR': '%(abs_obj_dir)s',
-        'CHOWN_ROOT': '~/bin/chown_root',
-        'CHOWN_REVERT': '~/bin/chown_revert',
-        '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': 'artifact',
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/macosx64/releng.manifest',
-    #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_artifact.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
-    'mozconfig_variant': 'artifact',
-}
--- 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
@@ -14,11 +14,9 @@ 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',
         ##
     },
-    'artifact_flag_build_variant_in_try': 'cross-debug-artifact',
-    #######################
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_artifact.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
-    'mozconfig_variant': 'debug-artifact',
-}
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_searchfox.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_searchfox.py
@@ -21,11 +21,9 @@ config = {
         # Disable sccache because otherwise we won't index the files that
         # sccache optimizes away compilation for
         'SCCACHE_DISABLE': '1',
         # 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-searchfox',
-    'artifact_flag_build_variant_in_try': None,
-    #######################
 }
--- 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
@@ -15,10 +15,9 @@ 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',
     },
-    '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
@@ -14,11 +14,9 @@ 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',
         ##
     },
-    'artifact_flag_build_variant_in_try': 'cross-debug-artifact',
-    #######################
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug_artifact.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import os
-
-config = {
-    #########################################################################
-    ######## MACOSX GENERIC CONFIG KEYS/VAlUES
-
-    'default_actions': [
-        'build',
-    ],
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    'vcs_share_base': '/builds/hg-shared',
-    # debug specific
-    'debug_build': True,
-    # allows triggering of test jobs when --artifact try syntax is detected
-    #########################################################################
-
-
-    #########################################################################
-    ###### 64 bit specific ######
-    'platform': 'macosx64',
-    'stage_platform': 'macosx64-debug',
-    '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',
-        # debug-specific
-        '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',
-    #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_artifact.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
-    'mozconfig_variant': 'artifact',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug_artifact.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
-    'mozconfig_variant': 'debug-artifact',
-}
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
@@ -18,11 +18,9 @@ releng.manifest",
         'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
                 '%s' % (os.environ.get('path')),
         'TINDERBOX_OUTPUT': '1',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/c/builds',
     },
     'mozconfig_variant': 'debug-static-analysis',
-    'artifact_flag_build_variant_in_try': None,
-    #######################
 }
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_artifact.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
-    'mozconfig_variant': 'artifact',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug_artifact.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
-    'mozconfig_variant': 'debug-artifact',
-}
--- a/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py
@@ -1,8 +1,7 @@
 config = {
     'stage_platform': 'win32-noopt-debug',
     'debug_build': True,
     'env': {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     },
-    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py
@@ -1,8 +1,7 @@
 config = {
     'stage_platform': 'win64-noopt-debug',
     'debug_build': True,
     'env': {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     },
-    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
@@ -3,10 +3,9 @@ config = {
         'build',
     ],
     'stage_platform': 'win64-rusttests',
     'env': {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     },
     'build_targets': ['pre-export', 'export', 'recurse_rusttests'],
     'disable_package_metrics': True,
-    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/searchfox_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/searchfox_debug.py
@@ -3,10 +3,9 @@ config = {
     'debug_build': True,
     'env': {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         # Disable sccache because otherwise we won't index the files that
         # sccache optimizes away compilation for
         'SCCACHE_DISABLE': '1',
     },
     'mozconfig_variant': 'debug-searchfox',
-    'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -348,65 +348,53 @@ class BuildOptionParser(object):
         'add-on-devel': 'builds/releng_sub_%s_configs/%s_add-on-devel.py',
         'asan': 'builds/releng_sub_%s_configs/%s_asan.py',
         'asan-tc': 'builds/releng_sub_%s_configs/%s_asan_tc.py',
         'asan-reporter-tc': 'builds/releng_sub_%s_configs/%s_asan_reporter_tc.py',
         'fuzzing-asan-tc': 'builds/releng_sub_%s_configs/%s_fuzzing_asan_tc.py',
         'tsan': 'builds/releng_sub_%s_configs/%s_tsan.py',
         'cross-debug': 'builds/releng_sub_%s_configs/%s_cross_debug.py',
         'cross-debug-searchfox': 'builds/releng_sub_%s_configs/%s_cross_debug_searchfox.py',
-        'cross-debug-artifact': 'builds/releng_sub_%s_configs/%s_cross_debug_artifact.py',
         'cross-noopt-debug': 'builds/releng_sub_%s_configs/%s_cross_noopt_debug.py',
         'cross-fuzzing-asan': 'builds/releng_sub_%s_configs/%s_cross_fuzzing_asan.py',
-        'cross-artifact': 'builds/releng_sub_%s_configs/%s_cross_artifact.py',
         'debug': 'builds/releng_sub_%s_configs/%s_debug.py',
         'fuzzing-debug': 'builds/releng_sub_%s_configs/%s_fuzzing_debug.py',
         'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py',
         'asan-tc-and-debug': 'builds/releng_sub_%s_configs/%s_asan_tc_and_debug.py',
         'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
         'code-coverage-debug': 'builds/releng_sub_%s_configs/%s_code_coverage_debug.py',
         'code-coverage-opt': 'builds/releng_sub_%s_configs/%s_code_coverage_opt.py',
         'source': 'builds/releng_sub_%s_configs/%s_source.py',
         'noopt-debug': 'builds/releng_sub_%s_configs/%s_noopt_debug.py',
         'api-16-gradle-dependencies':
             'builds/releng_sub_%s_configs/%s_api_16_gradle_dependencies.py',
         'api-16': 'builds/releng_sub_%s_configs/%s_api_16.py',
-        'api-16-artifact': 'builds/releng_sub_%s_configs/%s_api_16_artifact.py',
         'api-16-debug': 'builds/releng_sub_%s_configs/%s_api_16_debug.py',
         'api-16-debug-ccov': 'builds/releng_sub_%s_configs/%s_api_16_debug_ccov.py',
-        'api-16-debug-artifact': 'builds/releng_sub_%s_configs/%s_api_16_debug_artifact.py',
         'api-16-debug-searchfox': 'builds/releng_sub_%s_configs/%s_api_16_debug_searchfox.py',
         'api-16-gradle': 'builds/releng_sub_%s_configs/%s_api_16_gradle.py',
-        'api-16-gradle-artifact': 'builds/releng_sub_%s_configs/%s_api_16_gradle_artifact.py',
         'api-16-without-google-play-services':
             'builds/releng_sub_%s_configs/%s_api_16_without_google_play_services.py',
         'rusttests': 'builds/releng_sub_%s_configs/%s_rusttests.py',
         'rusttests-debug': 'builds/releng_sub_%s_configs/%s_rusttests_debug.py',
         'x86': 'builds/releng_sub_%s_configs/%s_x86.py',
-        'x86-artifact': 'builds/releng_sub_%s_configs/%s_x86_artifact.py',
         'x86-fuzzing-debug': 'builds/releng_sub_%s_configs/%s_x86_fuzzing_debug.py',
         'x86_64': 'builds/releng_sub_%s_configs/%s_x86_64.py',
-        'x86_64-artifact': 'builds/releng_sub_%s_configs/%s_x86_64_artifact.py',
         'x86_64-debug': 'builds/releng_sub_%s_configs/%s_x86_64_debug.py',
-        'x86_64-debug-artifact': 'builds/releng_sub_%s_configs/%s_x86_64_debug_artifact.py',
         'api-16-partner-sample1': 'builds/releng_sub_%s_configs/%s_api_16_partner_sample1.py',
         'aarch64': 'builds/releng_sub_%s_configs/%s_aarch64.py',
-        'aarch64-artifact': 'builds/releng_sub_%s_configs/%s_aarch64_artifact.py',
         'aarch64-debug': 'builds/releng_sub_%s_configs/%s_aarch64_debug.py',
-        'aarch64-debug-artifact': 'builds/releng_sub_%s_configs/%s_aarch64_debug_artifact.py',
         'android-test': 'builds/releng_sub_%s_configs/%s_test.py',
         'android-test-ccov': 'builds/releng_sub_%s_configs/%s_test_ccov.py',
         'android-checkstyle': 'builds/releng_sub_%s_configs/%s_checkstyle.py',
         'android-api-lint': 'builds/releng_sub_%s_configs/%s_api_lint.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',
         '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
@@ -1283,17 +1271,17 @@ or run without that action (ie: --no-{ac
             command=[
                 'make', 'source-package', 'source-upload',
             ],
             cwd=dirs['abs_obj_dir'],
             env=env, output_timeout=60*45, halt_on_failure=True,
         )
 
     def check_test(self):
-        if self.config.get('forced_artifact_build'):
+        if os.environ.get('USE_ARTIFACT'):
             self.info('Skipping due to forced artifact build.')
             return
         c = self.config
         dirs = self.query_abs_dirs()
 
         env = self.query_build_env()
         env.update(self.query_check_test_env())
 
@@ -1621,17 +1609,17 @@ or run without that action (ie: --no-{ac
         """grab build stats following a compile.
 
         This action handles all statistics from a build: 'count_ctors'
         and then posts to graph server the results.
         We only post to graph server for non nightly build
         """
         self.info('Collecting build metrics')
 
-        if self.config.get('forced_artifact_build'):
+        if os.environ.get('USE_ARTIFACT'):
             self.info('Skipping due to forced artifact build.')
             return
 
         c = self.config
 
         # Report some important file sizes for display in treeherder
 
         perfherder_data = {
--- a/testing/mozharness/scripts/fx_desktop_build.py
+++ b/testing/mozharness/scripts/fx_desktop_build.py
@@ -9,27 +9,25 @@
 script harness to build nightly firefox within Mozilla's build environment
 and developer machines alike
 
 author: Jordan Lund
 
 """
 
 import copy
-import pprint
 import sys
 import os
 
 # load modules from parent dir
 sys.path.insert(1, os.path.dirname(sys.path[0]))
 
 import mozharness.base.script as script
 from mozharness.mozilla.building.buildbase import BUILD_BASE_CONFIG_OPTIONS, \
-    BuildingConfig, BuildOptionParser, BuildScript
-from mozharness.base.config import parse_config_file
+    BuildingConfig, BuildScript
 from mozharness.mozilla.testing.try_tools import TryToolsMixin, try_config_options
 
 
 class FxDesktopBuild(BuildScript, TryToolsMixin, object):
     def __init__(self):
         buildscript_kwargs = {
             'config_options': BUILD_BASE_CONFIG_OPTIONS + copy.deepcopy(try_config_options),
             'all_actions': [
@@ -80,100 +78,16 @@ class FxDesktopBuild(BuildScript, TryToo
                 'virtualenv_path': 'venv',
                 #
 
             },
             'ConfigClass': BuildingConfig,
         }
         super(FxDesktopBuild, self).__init__(**buildscript_kwargs)
 
-    def _pre_config_lock(self, rw_config):
-        """grab properties if we are running this in automation"""
-        super(FxDesktopBuild, self)._pre_config_lock(rw_config)
-        c = self.config
-        if os.environ.get('USE_ARTIFACT'):
-            # Not all jobs that look like builds can be made into artifact
-            # builds (for example, various SAN builds will not make sense as
-            # artifact builds).  By default, only a vanilla debug or opt build
-            # will be replaced by an artifact build.
-            #
-            # In addition, some jobs want to specify their artifact equivalent.
-            # Use `artifact_flag_build_variant_in_try` to specify that variant.
-            #
-            # This is temporary, until we find a way to introduce an "artifact
-            # build dimension" like "opt"/"debug" into the CI configurations.
-            self.info('Artifact build requested by try push.')
-
-            variant = None
-
-            if 'artifact_flag_build_variant_in_try' in c:
-                variant = c['artifact_flag_build_variant_in_try']
-                if not variant:
-                    self.info('Build variant has falsy `artifact_flag_build_variant_in_try`; '
-                              'ignoring artifact build request and performing original build.')
-                    return
-                self.info('Build variant has `artifact_build_variant_in_try`: "%s".' % variant)
-            else:
-                if not c.get('build_variant'):
-                    if c.get('debug_build'):
-                        variant = 'debug-artifact'
-                    else:
-                        variant = 'artifact'
-                elif c.get('build_variant') in ['debug', 'cross-debug']:
-                    variant = 'debug-artifact'
-
-            if variant:
-                self.info('Using artifact build variant "%s".' % variant)
-                self._update_build_variant(rw_config, variant)
-
-    # helpers
-    def _update_build_variant(self, rw_config, variant='artifact'):
-        """ Intended for use in _pre_config_lock """
-        c = self.config
-        variant_cfg_path, _ = BuildOptionParser.find_variant_cfg_path(
-            '--custom-build-variant-cfg',
-            variant,
-            rw_config.config_parser
-        )
-        if not variant_cfg_path:
-            self.fatal('Could not find appropriate config file for variant %s' % variant)
-        # Update other parts of config to keep dump-config accurate
-        # Only dump-config is affected because most config info is set during
-        # initial parsing
-        variant_cfg_dict = parse_config_file(variant_cfg_path)
-        rw_config.all_cfg_files_and_dicts.append((variant_cfg_path, variant_cfg_dict))
-        c.update({
-            'build_variant': variant,
-            'config_files': c['config_files'] + [variant_cfg_path]
-        })
-
-        self.info("Updating self.config with the following from {}:".format(variant_cfg_path))
-        self.info(pprint.pformat(variant_cfg_dict))
-        c.update(variant_cfg_dict)
-        c['forced_artifact_build'] = True
-        # Bug 1231320 adds MOZHARNESS_ACTIONS in TaskCluster tasks to override default_actions
-        # We don't want that when forcing an artifact build.
-        if rw_config.volatile_config['actions']:
-            self.info("Updating volatile_config to include default_actions "
-                      "from {}.".format(variant_cfg_path))
-            # add default actions in correct order
-            combined_actions = []
-            for a in rw_config.all_actions:
-                if a in c['default_actions'] or a in rw_config.volatile_config['actions']:
-                    combined_actions.append(a)
-            rw_config.volatile_config['actions'] = combined_actions
-            self.info("Actions in volatile_config are now: {}".format(
-                rw_config.volatile_config['actions'])
-            )
-        # replace rw_config as well to set actions as in BaseScript
-        rw_config.set_config(c, overwrite=True)
-        rw_config.update_actions()
-        self.actions = tuple(rw_config.actions)
-        self.all_actions = tuple(rw_config.all_actions)
-
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
         c = self.config
         abs_dirs = super(FxDesktopBuild, self).query_abs_dirs()
         if not c.get('app_ini_path'):
             self.fatal('"app_ini_path" is needed in your config for this '
                        'script.')