mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 21:31:04 +00:00
9e795ff565
Previously, we were downloading tooltool.py from random servers. Considering tooltool.py is used to secure the download of future components, downloading tooltool.py from potentially 3rd party services was a major lapse in our end-to-end security, as a compromised tooltool.py wouldn't honor integrity checks. This commit copies the already vendored copy of tooltool.py into the mozharness directory. A copy needs to be in the mozharness directory because then a copy of mozharness without access to a source checkout will have access to it. We modify the code in mozharness that fetches tooltool to use the copy from mozharness (unless `mach artifact toolchain` is available). Since a copy of tooltool.py is always reliably available, we can remove all config entries related to tooltool.py. MozReview-Commit-ID: C7ls1xWrPMq --HG-- rename : python/mozbuild/mozbuild/action/tooltool.py => testing/mozharness/external_tools/tooltool.py extra : rebase_source : d7b48d837805f9312c97b6e21c6527cc5f5018dc
123 lines
4.3 KiB
Python
123 lines
4.3 KiB
Python
# 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/.
|
|
|
|
# Integrates Talos mozharness with mach
|
|
|
|
from __future__ import absolute_import, print_function, unicode_literals
|
|
|
|
import os
|
|
import sys
|
|
import json
|
|
import socket
|
|
|
|
from mozbuild.base import MozbuildObject, MachCommandBase
|
|
from mach.decorators import CommandProvider, Command
|
|
|
|
HERE = os.path.dirname(os.path.realpath(__file__))
|
|
|
|
|
|
class TalosRunner(MozbuildObject):
|
|
def run_test(self, talos_args):
|
|
"""
|
|
We want to do couple of things before running Talos
|
|
1. Clone mozharness
|
|
2. Make config for Talos Mozharness
|
|
3. Run mozharness
|
|
"""
|
|
|
|
self.init_variables(talos_args)
|
|
self.make_config()
|
|
self.write_config()
|
|
self.make_args()
|
|
return self.run_mozharness()
|
|
|
|
def init_variables(self, talos_args):
|
|
self.talos_dir = os.path.join(self.topsrcdir, 'testing', 'talos')
|
|
self.mozharness_dir = os.path.join(self.topsrcdir, 'testing',
|
|
'mozharness')
|
|
self.talos_json = os.path.join(self.talos_dir, 'talos.json')
|
|
self.config_file_path = os.path.join(self._topobjdir, 'testing',
|
|
'talos-in_tree_conf.json')
|
|
self.binary_path = self.get_binary_path()
|
|
self.virtualenv_script = os.path.join(self.topsrcdir, 'third_party', 'python',
|
|
'virtualenv', 'virtualenv.py')
|
|
self.virtualenv_path = os.path.join(self._topobjdir, 'testing',
|
|
'talos-venv')
|
|
self.python_interp = sys.executable
|
|
self.talos_args = talos_args
|
|
|
|
def make_config(self):
|
|
default_actions = ['populate-webroot']
|
|
if not os.path.exists(self.virtualenv_path):
|
|
default_actions.append('create-virtualenv')
|
|
default_actions.extend([
|
|
'setup-mitmproxy',
|
|
'run-tests',
|
|
])
|
|
self.config = {
|
|
'run_local': True,
|
|
'talos_json': self.talos_json,
|
|
'binary_path': self.binary_path,
|
|
'repo_path': self.topsrcdir,
|
|
'obj_path': self.topobjdir,
|
|
'log_name': 'talos',
|
|
'virtualenv_path': self.virtualenv_path,
|
|
'pypi_url': 'http://pypi.python.org/simple',
|
|
'base_work_dir': self.mozharness_dir,
|
|
'exes': {
|
|
'python': self.python_interp,
|
|
'virtualenv': [self.python_interp, self.virtualenv_script]
|
|
},
|
|
'title': socket.gethostname(),
|
|
'default_actions': default_actions,
|
|
'talos_extra_options': ['--develop'] + self.talos_args,
|
|
'python3_manifest': {
|
|
'win32': 'python3.manifest',
|
|
'win64': 'python3_x64.manifest',
|
|
}
|
|
}
|
|
|
|
def make_args(self):
|
|
self.args = {
|
|
'config': {},
|
|
'initial_config_file': self.config_file_path,
|
|
}
|
|
|
|
def write_config(self):
|
|
try:
|
|
config_file = open(self.config_file_path, 'wb')
|
|
config_file.write(json.dumps(self.config))
|
|
except IOError as e:
|
|
err_str = "Error writing to Talos Mozharness config file {0}:{1}"
|
|
print(err_str.format(self.config_file_path, str(e)))
|
|
raise e
|
|
|
|
def run_mozharness(self):
|
|
sys.path.insert(0, self.mozharness_dir)
|
|
from mozharness.mozilla.testing.talos import Talos
|
|
talos_mh = Talos(config=self.args['config'],
|
|
initial_config_file=self.args['initial_config_file'])
|
|
return talos_mh.run()
|
|
|
|
|
|
def create_parser():
|
|
sys.path.insert(0, HERE) # allow to import the talos package
|
|
from talos.cmdline import create_parser
|
|
return create_parser(mach_interface=True)
|
|
|
|
|
|
@CommandProvider
|
|
class MachCommands(MachCommandBase):
|
|
@Command('talos-test', category='testing',
|
|
description='Run talos tests (performance testing).',
|
|
parser=create_parser)
|
|
def run_talos_test(self, **kwargs):
|
|
talos = self._spawn(TalosRunner)
|
|
|
|
try:
|
|
return talos.run_test(sys.argv[2:])
|
|
except Exception as e:
|
|
print(str(e))
|
|
return 1
|