Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1527313: Reduce extraneous differences in taskcluster mozharness scripts; r=Callek

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D62408

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tom Prince 2020-02-11 19:47:09 +00:00
parent 4758b0ed46
commit 3a1632ef7a
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
taskcluster/scripts/builder/build-l10n.sh
View File

@ -21,6 +21,8 @@ echo "running as" $(id)
: TOOLTOOL_CACHE ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
: MOZ_SCM_LEVEL ${MOZ_SCM_LEVEL:=1}
: NEED_XVFB ${NEED_XVFB:=false}
: MOZ_SCM_LEVEL ${MOZ_SCM_LEVEL:=1}
@ -44,7 +46,7 @@ export LIBRARY_PATH=$LIBRARY_PATH:$WORKSPACE/src/obj-firefox:$WORKSPACE/src/gcc/
# test required parameters are supplied
if [[ -z ${MOZHARNESS_SCRIPT} ]]; then fail "MOZHARNESS_SCRIPT is not set"; fi
if [[ -z ${MOZHARNESS_CONFIG} ]]; then fail "MOZHARNESS_CONFIG is not set"; fi
if [[ -z "${MOZHARNESS_CONFIG}" && -z "${EXTRA_MOZHARNESS_CONFIG}" ]]; then fail "MOZHARNESS_CONFIG or EXTRA_MOZHARNESS_CONFIG is not set"; fi
cleanup() {
local rv=$?
@ -67,7 +69,7 @@ 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}"
config_path_cmds="${config_path_cmds} --extra-config-path ${GECKO_PATH}/${path}"
done
# support multiple, space delimited, config files
@ -96,9 +98,9 @@ fi
cd /builds/worker
$GECKO_PATH/mach python $GECKO_PATH/testing/${MOZHARNESS_SCRIPT} \
$actions \
$options \
${config_path_cmds} \
${config_cmds} \
$actions \
$options \
--log-level=debug \
--work-dir=$WORKSPACE/build \

3
taskcluster/scripts/builder/build-linux.sh
View File

@ -18,12 +18,13 @@ echo "running as" $(id)
: TOOLTOOL_CACHE ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
: MOZ_SCM_LEVEL ${MOZ_SCM_LEVEL:=1}
: NEED_XVFB ${NEED_XVFB:=false}
: MH_CUSTOM_BUILD_VARIANT_CFG ${MH_CUSTOM_BUILD_VARIANT_CFG}
: MH_BRANCH ${MH_BRANCH:=mozilla-central}
: MH_BUILD_POOL ${MH_BUILD_POOL:=staging}
: MOZ_SCM_LEVEL ${MOZ_SCM_LEVEL:=1}
: WORKSPACE ${WORKSPACE:=/builds/worker/workspace}

6
taskcluster/scripts/builder/repackage.sh
View File

@ -20,6 +20,8 @@ echo "running as" $(id)
: TOOLTOOL_CACHE ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
: MOZ_SCM_LEVEL ${MOZ_SCM_LEVEL:=1}
: WORKSPACE ${WORKSPACE:=/builds/worker/workspace}
set -v
@ -40,7 +42,7 @@ export MOZ_SIMPLE_PACKAGE_NAME=target
# test required parameters are supplied
if [[ -z ${MOZHARNESS_SCRIPT} ]]; then fail "MOZHARNESS_SCRIPT is not set"; fi
if [[ -z ${MOZHARNESS_CONFIG} ]]; then fail "MOZHARNESS_CONFIG is not set"; fi
if [[ -z "${MOZHARNESS_CONFIG}" && -z "${EXTRA_MOZHARNESS_CONFIG}" ]]; then fail "MOZHARNESS_CONFIG or EXTRA_MOZHARNESS_CONFIG is not set"; fi
cleanup() {
local rv=$?
@ -63,7 +65,7 @@ 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}"
config_path_cmds="${config_path_cmds} --extra-config-path ${GECKO_PATH}/${path}"
done
# support multiple, space delimited, config files