Bug 1434365: Add support for specifying mozharness config paths and checking out comm-central to repackage tasks; r=aki

Differential Revision: https://phabricator.services.mozilla.com/D512

--HG--
extra : rebase_source : dc165357115f51475279f90679b89c14ec1c6038
This commit is contained in:
Tom Prince 2018-01-30 11:50:57 -07:00
parent 521c194c6c
commit 6b745cb132
2 changed files with 17 additions and 1 deletions

View File

@ -14,6 +14,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}
@ -60,6 +61,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
@ -86,7 +92,9 @@ fi
cd /builds/worker
python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} ${config_cmds} \
python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
${config_path_cmds} \
${config_cmds} \
$actions \
$options \
--log-level=debug \

View File

@ -69,6 +69,14 @@ packaging_description_schema = Schema({
Required('mozharness'): {
# 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'): [basestring],
# if true, perform a checkout of a comm-central based branch inside the
# gecko checkout
Required('comm-checkout', default=False): bool,
}
})