Backed out 4 changesets (bug 1415618) for build bustage failures. r=backout on a CLOSED TREE

Backed out changeset 71510fd07ef5 (bug 1415618)
Backed out changeset 780f67a36d6d (bug 1415618)
Backed out changeset 5ecdc55db739 (bug 1415618)
Backed out changeset be3173822987 (bug 1415618)

taskcluster/scripts/builder/build-linux.sh

@@ -12,7 +12,6 @@ echo "running as" $(id)
 
 : MOZHARNESS_SCRIPT             ${MOZHARNESS_SCRIPT}
 : MOZHARNESS_CONFIG             ${MOZHARNESS_CONFIG}
-: MOZHARNESS_CONFIG_PATHS       ${MOZHARNESS_CONFIG_PATHS}
 : MOZHARNESS_ACTIONS            ${MOZHARNESS_ACTIONS}
 : MOZHARNESS_OPTIONS            ${MOZHARNESS_OPTIONS}
 
@@ -89,11 +88,6 @@ fi
 # entirely effective.
 export TOOLTOOL_CACHE
 
-config_path_cmds=""
-for path in ${MOZHARNESS_CONFIG_PATHS}; do
-    config_path_cmds="${config_path_cmds} --extra-config-path ${WORKSPACE}/build/src/${path}"
-done
-
 # support multiple, space delimited, config files
 config_cmds=""
 for cfg in $MOZHARNESS_CONFIG; do
@@ -120,9 +114,7 @@ fi
 
 cd /builds/worker
 
-python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
-  ${config_path_cmds} \
-  ${config_cmds} \
+python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} ${config_cmds} \
   $debug_flag \
   $custom_build_variant_cfg_flag \
   --disable-mock \

taskcluster/taskgraph/transforms/job/mozharness.py

@@ -34,13 +34,8 @@ mozharness_run_schema = Schema({
     # directory and using forward slashes even on Windows
     Required('script'): basestring,
 
-    # Additional paths to look for mozharness configs in. These should be
-    # relative to the base of the source checkout
-    Optional('config-paths'): [basestring],
-
     # the config files required for the task, relative to
-    # testing/mozharness/configs or one of the paths specified in
-    # `config-paths` and using forward slashes even on Windows
+    # testing/mozharness/configs and using forward slashes even on Windows
     Required('config'): [basestring],
 
     # any additional actions to pass to the mozharness command
@@ -145,9 +140,6 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc):
     if 'options' in run:
         env['MOZHARNESS_OPTIONS'] = ' '.join(run['options'])
 
-    if 'config-paths' in run:
-        env['MOZHARNESS_CONFIG_PATHS'] = ' '.join(run['config-paths'])
-
     if 'custom-build-variant-cfg' in run:
         env['MH_CUSTOM_BUILD_VARIANT_CFG'] = run['custom-build-variant-cfg']
 
@@ -243,12 +235,6 @@ def mozharness_on_generic_worker(config, job, taskdesc):
 
     mh_command = [r'c:\mozilla-build\python\python.exe']
     mh_command.append('\\'.join([r'.\build\src\testing', run['script'].replace('/', '\\')]))
-
-    if 'config-paths' in run:
-        for path in run['config-paths']:
-            mh_command.append(r'--extra-config-path '
-                              r'.\build\src\{}'.format(path.replace('/', '\\')))
-
     for cfg in run['config']:
         mh_command.append('--config ' + cfg.replace('/', '\\'))
     if run['use-magic-mh-args']:

testing/mozharness/mozharness/base/config.py

@@ -135,8 +135,6 @@ class ReadOnlyDict(dict):
             result[k] = deepcopy(v, memo)
         return result
 
-DEFAULT_CONFIG_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "configs")
-
 # parse_config_file {{{1
 def parse_config_file(file_name, quiet=False, search_path=None,
                       config_dict_name="config"):
@@ -147,7 +145,8 @@ def parse_config_file(file_name, quiet=False, search_path=None,
         file_path = file_name
     else:
         if not search_path:
-            search_path = ['.', DEFAULT_CONFIG_PATH]
+            search_path = ['.', os.path.join(sys.path[0], '..', 'configs'),
+                           os.path.join(sys.path[0], '..', '..', 'configs')]
         for path in search_path:
             if os.path.exists(os.path.join(path, file_name)):
                 file_path = os.path.join(path, file_name)
@@ -280,10 +279,6 @@ class BaseConfig(object):
             type="string", default=os.getcwd(),
             help="Specify the absolute path of the parent of the working directory"
         )
-        self.config_parser.add_option(
-            "--extra-config-path", action='extend', dest="config_paths",
-            type="string", help="Specify additional paths to search for config files.",
-        )
         self.config_parser.add_option(
             "-c", "--config-file", "--cfg", action="extend", dest="config_files",
             type="string", help="Specify a config file; can be repeated"
@@ -437,7 +432,6 @@ class BaseConfig(object):
         way that self.config is made up.  See
         `mozharness.mozilla.building.buildbase.BuildingConfig` for an example.
         """
-        config_paths = options.config_paths or ['.']
         all_cfg_files_and_dicts = []
         for cf in all_config_files:
             try:
@@ -446,12 +440,10 @@ class BaseConfig(object):
                     file_path = os.path.join(os.getcwd(), file_name)
                     download_config_file(cf, file_path)
                     all_cfg_files_and_dicts.append(
-                        (file_path, parse_config_file(file_path, search_path=["."]))
+                        (file_path, parse_config_file(file_path))
                     )
                 else:
-                    all_cfg_files_and_dicts.append(
-                        (cf, parse_config_file(cf, search_path=config_paths + [DEFAULT_CONFIG_PATH]))
-                    )
+                    all_cfg_files_and_dicts.append((cf, parse_config_file(cf)))
             except Exception:
                 if cf in options.opt_config_files:
                     print(

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -26,7 +26,7 @@ from itertools import chain
 import sys
 from datetime import datetime
 import re
-from mozharness.base.config import BaseConfig, parse_config_file, DEFAULT_CONFIG_PATH
+from mozharness.base.config import BaseConfig, parse_config_file
 from mozharness.base.log import ERROR, OutputParser, FATAL
 from mozharness.base.script import PostScriptRun
 from mozharness.base.vcs.vcsbase import MercurialScript
@@ -399,6 +399,10 @@ class BuildOptionParser(object):
     # TODO add nosetests for this class
     platform = None
     bits = None
+    config_file_search_path = [
+        '.', os.path.join(sys.path[0], '..', 'configs'),
+        os.path.join(sys.path[0], '..', '..', 'configs')
+    ]
 
     # add to this list and you can automagically do things like
     # --custom-build-variant-cfg asan
@@ -518,14 +522,9 @@ class BuildOptionParser(object):
             # now let's see if we were given a valid pathname
             valid_variant_cfg_path = value
         else:
-            # FIXME: We should actually wait until we have parsed all arguments
-            # before looking at this, otherwise the behavior will depend on the
-            # order of arguments. But that isn't a problem as long as --extra-config-path
-            # is always passed first.
-            config_paths = parser.values.config_paths + [DEFAULT_CONFIG_PATH]
             # let's take our prospective_cfg_path and see if we can
             # determine an existing file
-            for path in config_paths:
+            for path in cls.config_file_search_path:
                 if os.path.exists(os.path.join(path, prospective_cfg_path)):
                     # success! we found a config file
                     valid_variant_cfg_path = os.path.join(path,