Keep build/mozconfig.cache in sync (port of bug 1278990). rs=bustage-fix
This commit is contained in:
Родитель
e1bb0bdc95
Коммит
872763e139
|
@ -7,6 +7,8 @@
|
|||
# Avoid duplication if the file happens to be included twice.
|
||||
if test -z "$bucket" -a -z "$NO_CACHE"; then
|
||||
|
||||
# buildbot (or builders that use buildprops.json):
|
||||
if [ -f $topsrcdir/../buildprops.json ]; then
|
||||
read branch platform master <<EOF
|
||||
$(python2.7 -c 'import json; p = json.loads(open("'"$topsrcdir"'/../buildprops.json").read())["properties"]; print p["branch"], p["platform"], p["master"]' 2> /dev/null)
|
||||
EOF
|
||||
|
@ -40,6 +42,53 @@ if test -z "$SCCACHE_DISABLE" -a -z "$no_sccache" -a -z "$MOZ_PGO_IS_SET" -a -z
|
|||
esac
|
||||
fi
|
||||
|
||||
# builds without buildprops (eg: taskcluster or non-buildbot) and without ccache env config and without sccache disabled:
|
||||
elif test -z "$CCACHE_DIR" -a -z "$SCCACHE_DISABLE" -a -z "$no_sccache" -a -z "$MOZ_PGO_IS_SET" -a -z "$MOZ_PGO"; then
|
||||
|
||||
# prevent rerun if az is set, or wget is not available
|
||||
if test -z "$availability_zone" -a -x "$(command -v wget)"; then
|
||||
# timeout after 1 second, and don't retry (failure indicates instance is not in ec2 or network issue)
|
||||
# availability_zone is of the form <region><letter> where region is e.g. us-west-2, and az is us-west-2a
|
||||
availability_zone=$(wget -T 1 -t 1 -q -O - http://169.254.169.254/latest/meta-data/placement/availability-zone || true)
|
||||
if test -z "$availability_zone" -o "$availability_zone" = "not-ec2"; then
|
||||
availability_zone=not-ec2
|
||||
else
|
||||
# region is az with last letter trimmed
|
||||
region=${availability_zone%?}
|
||||
# set S3 bucket according to tree (level)
|
||||
case "${GECKO_HEAD_REPOSITORY}" in
|
||||
*hg.mozilla.org/try*)
|
||||
bucket=taskcluster-level-1-sccache-${region}
|
||||
;;
|
||||
*hg.mozilla.org/integration/mozilla-inbound*|*hg.mozilla.org/integration/fx-team*)
|
||||
bucket=taskcluster-level-3-sccache-${region}
|
||||
;;
|
||||
esac
|
||||
|
||||
# set a dummy master
|
||||
case "${region}" in
|
||||
us-east-1)
|
||||
master=dummy.use1.mozilla.com
|
||||
;;
|
||||
us-west-1)
|
||||
master=dummy.usw1.mozilla.com
|
||||
;;
|
||||
us-west-2)
|
||||
master=dummy.usw2.mozilla.com
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# set platform based on the SYSTEMROOT env var
|
||||
case "${SYSTEMROOT}" in
|
||||
*Windows)
|
||||
platform=windows
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test -z "$bucket"; then
|
||||
case "$platform" in
|
||||
win*) : ;;
|
||||
|
@ -53,7 +102,7 @@ else
|
|||
fi
|
||||
mk_add_options "export SCCACHE_BUCKET=$bucket"
|
||||
case "$master" in
|
||||
*use1.mozilla.com*|*usw2.mozilla.com*)
|
||||
*us[ew][12].mozilla.com*)
|
||||
mk_add_options "export SCCACHE_NAMESERVER=169.254.169.253"
|
||||
;;
|
||||
esac
|
||||
|
|
Загрузка…
Ссылка в новой задаче