Bug 1414678 - Pass through MOZ_SCM_LEVEL, so that secret fetching works. r=Callek

MozReview-Commit-ID: IqtMzMsjxOZ

--HG--
extra : rebase_source : eefc31daa43894a08c9bc9eb1da40faeb466c2a5
extra : source : a5a189a375dcc63af11dec3afa2d6491e52ddc4e
This commit is contained in:
Nick Alexander 2017-11-06 11:32:40 -08:00
parent e99464f25e
commit b4332702f0
3 changed files with 21 additions and 0 deletions

View File

@ -22,6 +22,8 @@ echo "running as" $(id)
: NEED_XVFB ${NEED_XVFB:=false}
: MOZ_SCM_LEVEL ${MOZ_SCM_LEVEL:=1}
: WORKSPACE ${WORKSPACE:=/builds/worker/workspace}
set -v
@ -95,4 +97,5 @@ python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
$options \
${config_cmds} \
--log-level=debug \
--scm-level=$MOZ_SCM_LEVEL \
--work-dir=$WORKSPACE/build \

View File

@ -160,6 +160,15 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
"dest": "disable_mock",
"action": "store_true",
"help": "do not run under mock despite what gecko-config says"}
], [
['--scm-level'], { # Ignored on desktop for now: see Bug 1414678.
"action": "store",
"type": "int",
"dest": "scm_level",
"default": 1,
"help": "This sets the SCM level for the branch being built."
" See https://www.mozilla.org/en-US/about/"
"governance/policies/commit/access-policy/"}
]]
def __init__(self, require_config_file=True):

View File

@ -120,6 +120,15 @@ class MobileSingleLocale(MockMixin, LocalesMixin, ReleaseMixin,
"type": "string",
"help": "Override the gecko revision to use (otherwise use buildbot supplied"
" value, or en-US revision) "}
], [
['--scm-level'],
{"action": "store",
"type": "int",
"dest": "scm_level",
"default": 1,
"help": "This sets the SCM level for the branch being built."
" See https://www.mozilla.org/en-US/about/"
"governance/policies/commit/access-policy/"}
]]
def __init__(self, require_config_file=True):