Bug 1414678 - Pass through MOZ_SCM_LEVEL, so that secret fetching works. r=Callek
authorNick Alexander <nalexander@mozilla.com>
Mon, 06 Nov 2017 11:32:40 -0800
changeset 443889 3f07fe29ae82dddc492c16c168b2475a56528394
parent 443888 48d145c66364885612e62a6aeefd048d2fc11952
child 443890 eae1b436e4a63c4fcdd3553ad1ffdb26c3e527b6
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs1414678
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1414678 - Pass through MOZ_SCM_LEVEL, so that secret fetching works. r=Callek MozReview-Commit-ID: IqtMzMsjxOZ
taskcluster/scripts/builder/build-l10n.sh
testing/mozharness/scripts/desktop_l10n.py
testing/mozharness/scripts/mobile_l10n.py
--- a/taskcluster/scripts/builder/build-l10n.sh
+++ b/taskcluster/scripts/builder/build-l10n.sh
@@ -17,16 +17,18 @@ echo "running as" $(id)
 : MOZHARNESS_CONFIG             ${MOZHARNESS_CONFIG}
 : MOZHARNESS_ACTIONS            ${MOZHARNESS_ACTIONS}
 : MOZHARNESS_OPTIONS            ${MOZHARNESS_OPTIONS}
 
 : TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
 
 : NEED_XVFB                     ${NEED_XVFB:=false}
 
+: MOZ_SCM_LEVEL                 ${MOZ_SCM_LEVEL:=1}
+
 : WORKSPACE                     ${WORKSPACE:=/builds/worker/workspace}
 
 set -v
 
 fail() {
     echo # make sure error message is on a new line
     echo "[build-l10n.sh:error]" "${@}"
     exit 1
@@ -90,9 +92,10 @@ cd /builds/worker
 
 python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
   --disable-mock \
   --revision ${GECKO_HEAD_REV} \
   $actions \
   $options \
   ${config_cmds} \
   --log-level=debug \
+  --scm-level=$MOZ_SCM_LEVEL \
   --work-dir=$WORKSPACE/build \
--- a/testing/mozharness/scripts/desktop_l10n.py
+++ b/testing/mozharness/scripts/desktop_l10n.py
@@ -155,16 +155,25 @@ class DesktopSingleLocale(LocalesMixin, 
          "dest": "en_us_installer_url",
          "type": "string",
          "help": "Specify the url of the en-us binary"}
     ], [
         ["--disable-mock"], {
          "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):
         # fxbuild style:
         buildscript_kwargs = {
             'all_actions': [
                 "clobber",
                 "pull",
--- a/testing/mozharness/scripts/mobile_l10n.py
+++ b/testing/mozharness/scripts/mobile_l10n.py
@@ -115,16 +115,25 @@ class MobileSingleLocale(MockMixin, Loca
          }
     ], [
         ['--revision', ],
         {"action": "store",
          "dest": "revision",
          "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):
         buildscript_kwargs = {
             'all_actions': [
                 "get-secrets",
                 "clobber",
                 "pull",