Bug 1278698 - Get forced artifact build working in TaskCluster vs Buildbot; r=armenzg
authorMaja Frydrychowicz <mjzffr@gmail.com>
Fri, 09 Sep 2016 11:46:35 -0400
changeset 313411 ac7f8d39573545555142542bddec934a249b3217
parent 313410 bd82d664a18cc6b4a2a8f1e8b31409c986558371
child 313412 2f5a249215f61370806612b08ba1e2665df412a9
push id30681
push userphilringnalda@gmail.com
push dateSat, 10 Sep 2016 07:13:06 +0000
treeherdermozilla-central@61cc64967515 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarmenzg
bugs1278698
milestone51.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 1278698 - Get forced artifact build working in TaskCluster vs Buildbot; r=armenzg Override actions specified in TC task definition with default_actions from artifact config Clear MOZ_SIGN_CMD when enable_signed is set to False. MozReview-Commit-ID: FmI6lu5EKWg
testing/mozharness/mozharness/mozilla/building/buildbase.py
testing/mozharness/scripts/fx_desktop_build.py
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -881,16 +881,21 @@ or run without that action (ie: --no-{ac
                 moz_sign_cmd = subprocess.list2cmdline(
                     self.query_moz_sign_cmd(formats=None)
                 )
                 # windows fix. This is passed to mach build env and we call that
                 # with python, not with bash so we need to fix the slashes here
                 env['MOZ_SIGN_CMD'] = moz_sign_cmd.replace('\\', '\\\\\\\\')
             else:
                 self.warning("signing disabled because MOZ_SIGNING_SERVERS is not set")
+        elif 'MOZ_SIGN_CMD' in env:
+            # Ensure that signing is truly disabled
+            # MOZ_SIGN_CMD may be defined by default in buildbot (see MozillaBuildFactory)
+            self.warning("Clearing MOZ_SIGN_CMD because we don't have config['enable_signing']")
+            del env['MOZ_SIGN_CMD']
 
         # to activate the right behaviour in mozonfigs while we transition
         if c.get('enable_release_promotion'):
             env['ENABLE_RELEASE_PROMOTION'] = "1"
             update_channel = c.get('update_channel', self.branch)
             self.info("Release promotion update channel: %s"
                       % (update_channel,))
             env["MOZ_UPDATE_CHANNEL"] = update_channel
--- a/testing/mozharness/scripts/fx_desktop_build.py
+++ b/testing/mozharness/scripts/fx_desktop_build.py
@@ -147,16 +147,20 @@ class FxDesktopBuild(BuildScript, TryToo
         c.update({
             'build_variant': variant,
             'config_files': c['config_files'] + [variant_cfg_path]
         })
 
         self.info("Updating self.config with the following from {}:".format(variant_cfg_path))
         self.info(pprint.pformat(variant_cfg_dict))
         c.update(variant_cfg_dict)
+        # Bug 1231320 adds MOZHARNESS_ACTIONS in TaskCluster tasks to override default_actions
+        # We don't want that when forcing an artifact build.
+        self.info("Clearing actions from volatile_config to use default_actions.")
+        rw_config.volatile_config['actions'] = None
         # replace rw_config as well to set actions as in BaseScript
         rw_config.set_config(c, overwrite=True)
         rw_config.update_actions()
         self.actions = tuple(rw_config.actions)
         self.all_actions = tuple(rw_config.all_actions)
 
 
     def query_abs_dirs(self):