Backed out changeset b6f04897fdda (bug 1365080) for mass build bustage

testing/mozharness/mozharness/mozilla/purge.py

@@ -10,7 +10,6 @@
 # Figure out where our external_tools are
 # These are in a sibling directory to the 'mozharness' module
 import os
-import sys
 import mozharness
 external_tools_path = os.path.join(
     os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__))),
@@ -48,7 +47,7 @@ class PurgeMixin(object):
         cmd = []
         if self._is_windows():
             # The virtualenv isn't setup yet, so just use python directly.
-            cmd.append(sys.executable))
+            cmd.append(self.query_exe('python'))
         # Add --dry-run if you don't want to do this for realz
         cmd.extend([self.clobber_tool])
         # TODO configurable list

testing/mozharness/mozharness/mozilla/signing.py

@@ -10,7 +10,6 @@
 import os
 import re
 import json
-import sys
 
 from mozharness.base.errors import BaseErrorList
 from mozharness.base.log import ERROR, FATAL
@@ -46,8 +45,9 @@ class SigningMixin(BaseSigningMixin):
         token = os.path.join(dirs['base_work_dir'], 'token')
         nonce = os.path.join(dirs['base_work_dir'], 'nonce')
         host_cert = os.path.join(signing_dir, 'host.cert')
+        python = self.query_exe('python')
         cmd = [
-            sys.executable,
+            python,
             os.path.join(signing_dir, 'signtool.py'),
             '--cachedir', cache_dir,
             '-t', token,

testing/mozharness/mozharness/mozilla/updates/balrog.py

@@ -1,6 +1,5 @@
 from itertools import chain
 import os
-import sys
 
 from mozharness.base.log import INFO
 
@@ -57,7 +56,7 @@ class BalrogMixin(object):
         self.generate_balrog_props(props_path)
 
         cmd = [
-            sys.executable,
+            self.query_exe("python"),
             submitter_script,
             "--build-properties", props_path,
             "-t", release_type,
@@ -91,7 +90,7 @@ class BalrogMixin(object):
 
     def submit_balrog_release_pusher(self, dirs):
         product = self.buildbot_config["properties"]["product"]
-        cmd = [sys.executable, os.path.join(os.path.join(dirs['abs_tools_dir'], "scripts/updates/balrog-release-pusher.py"))]
+        cmd = [self.query_exe("python"), os.path.join(os.path.join(dirs['abs_tools_dir'], "scripts/updates/balrog-release-pusher.py"))]
         cmd.extend(["--build-properties", os.path.join(dirs["base_work_dir"], "balrog_props.json")])
         cmd.extend(["--buildbot-configs", "https://hg.mozilla.org/build/buildbot-configs"])
         cmd.extend(["--release-config", os.path.join(dirs['build_dir'], self.config.get("release_config_file"))])
@@ -131,7 +130,7 @@ class BalrogMixin(object):
         )
 
         cmd = [
-            sys.executable,
+            self.query_exe("python"),
             submitter_script,
             "--credentials-file", credentials_file,
             "--api-root", c["balrog_api_root"],

testing/mozharness/scripts/release/publish_balrog.py

@@ -93,7 +93,7 @@ class PublishBalrog(MercurialScript, BuildbotMixin):
         dirs = self.query_abs_dirs()
         auth = os.path.join(os.getcwd(), self.config['credentials_file'])
         cmd = [
-            sys.executable,
+            self.query_exe("python"),
             os.path.join(dirs["abs_tools_dir"],
                          "scripts/build-promotion/balrog-release-shipper.py")]
         cmd.extend([

testing/mozharness/scripts/release/updates.py

@@ -235,7 +235,7 @@ class UpdatesBumper(MercurialScript, BuildbotMixin,
         patcher_config = self.query_patcher_config(channel_config)
         patcher_config_product = self.query_patcher_config_product(channel_config)
         for platform in self.config["platforms"]:
-            cmd = [sys.executable, script]
+            cmd = [self.query_exe("python"), script]
             output = self.query_update_verify_config(channel, platform)
             cmd.extend([
                 "--config", patcher_config,
@@ -274,7 +274,7 @@ class UpdatesBumper(MercurialScript, BuildbotMixin,
         dirs = self.query_abs_dirs()
         auth = os.path.join(os.getcwd(), self.config['credentials_file'])
         cmd = [
-            sys.executable,
+            self.query_exe("python"),
             os.path.join(dirs["abs_tools_dir"],
                          "scripts/build-promotion/balrog-release-pusher.py")]
         cmd.extend([