From df534f30a965c6ef34e9edf879271a8cf3064d81 Mon Sep 17 00:00:00 2001
From: Tom Prince <mozilla@hocat.ca>
Date: Mon, 27 Nov 2017 13:47:29 -0700
Subject: [PATCH] Bug 1426209: Allow passing `--extra-config-path in L10N
 tasks; r=jlund

MozReview-Commit-ID: FCG2K9L5Z3T

--HG--
extra : rebase_source : 9536c96f8aa7445149a7075b34310870d768f219
---
 taskcluster/scripts/builder/build-l10n.sh | 7 +++++++
 taskcluster/taskgraph/transforms/l10n.py  | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/taskcluster/scripts/builder/build-l10n.sh b/taskcluster/scripts/builder/build-l10n.sh
index ab5ea5c30fc0..e631ccfa15d1 100755
--- a/taskcluster/scripts/builder/build-l10n.sh
+++ b/taskcluster/scripts/builder/build-l10n.sh
@@ -15,6 +15,7 @@ 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}
 
@@ -64,6 +65,11 @@ 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
@@ -95,6 +101,7 @@ python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
   --revision ${GECKO_HEAD_REV} \
   $actions \
   $options \
+  ${config_path_cmds} \
   ${config_cmds} \
   --log-level=debug \
   --scm-level=$MOZ_SCM_LEVEL \
diff --git a/taskcluster/taskgraph/transforms/l10n.py b/taskcluster/taskgraph/transforms/l10n.py
index e53e9d5f75f7..3fcf547d69f0 100644
--- a/taskcluster/taskgraph/transforms/l10n.py
+++ b/taskcluster/taskgraph/transforms/l10n.py
@@ -65,6 +65,10 @@ l10n_description_schema = Schema({
         # Config files passed to the mozharness script
         Required('config'): _by_platform([basestring]),
 
+        # Additional paths to look for mozharness configs in. These should be
+        # relative to the base of the source checkout
+        Optional('config-paths'): _by_platform([basestring]),
+
         # Options to pass to the mozharness script
         Required('options'): _by_platform([basestring]),