Bug 1532434: don't hardcode host-utils path r=gbrown
authorAndrew Erickson <aerickson@mozilla.com>
Mon, 11 Mar 2019 15:02:03 +0000
changeset 524379 b761a7b69ababcd91034dbbe1410bd1089f4925f
parent 524378 ee2473319e97f98373b68151353b4de5e2cfc2c3
child 524380 9c46b805faebe42a7abc0a84fe5f35bacbb8970a
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
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 1532434: don't hardcode host-utils path r=gbrown Differential Revision: https://phabricator.services.mozilla.com/D22019
--- a/testing/mozbase/mozproxy/mozproxy/backends/mitm.py
+++ b/testing/mozbase/mozproxy/mozproxy/backends/mitm.py
@@ -1,14 +1,15 @@
 """Functions to download, install, setup, and use the mitmproxy playback tool"""
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import absolute_import
+import glob
 import os
 import subprocess
 import sys
 import time
 import mozinfo
 from mozprocess import ProcessHandler
@@ -422,17 +423,17 @@ class MitmproxyAndroid(Mitmproxy):
             if not have_manifest:
                 LOG.critical('failed to download the hostutils tooltool manifest')
             # now use the manifest to download hostutils so we can get certutil
             tooltool_download(_dest, self.config['run_local'], self.mozproxy_dir)
             # the production bitbar container host is always linux
-            self.certutil = os.path.join(self.mozproxy_dir, 'host-utils-67.0a1.en-US.linux-x86_64')
+            self.certutil = glob.glob(os.path.join(self.mozproxy_dir, 'host-utils*[!z]'))[0]
             # must add hostutils/certutil to the path
             os.environ['LD_LIBRARY_PATH'] = self.certutil
         bin_suffix = mozinfo.info.get('bin_suffix', '')
         self.certutil = os.path.join(self.certutil, "certutil" + bin_suffix)
         if os.path.isfile(self.certutil):