Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1154796 - sync in-tree copy of mozharness to hgmo mozharness 4a31e6739409, DONTBUILD r=ryanvm a=testing

Browse Source
This commit is contained in:
Jordan Lund 2015-07-09 09:53:03 -07:00
parent 28eb5a0126
commit cc42883d64
6 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/mozharness/configs/luciddream/linux_config.py
View File

@ -29,6 +29,8 @@ config = {
],
"pip_index": False,
"in_tree_config": "config/mozharness/linux_config.py",
"buildbot_json_path": "buildprops.json",
"default_blob_upload_servers": [

28
testing/mozharness/configs/vcs_sync/beagle.py
View File

@ -302,6 +302,34 @@ config = {
"url": "https://api.pub.build.mozilla.org/mapper",
"project": "gecko-dev"
},
}, {
"repo": "https://hg.mozilla.org/releases/mozilla-b2g37_v2_2r",
"revision": "default",
"repo_name": "mozilla-b2g37_v2_2r",
"targets": [{
"target_dest": "beagle/.git",
"vcs": "git",
"test_push": True,
}, {
"target_dest": "gitmo-beagle",
}, {
"target_dest": "github-beagle",
}],
"vcs": "hg",
"branch_config": {
"branches": {
"default": "b2g37_v2_2r",
},
},
"tag_config": {
"tag_regexes": [
"^B2G_",
],
},
"mapper": {
"url": "https://api.pub.build.mozilla.org/mapper",
"project": "gecko-dev"
},
}, {
"repo": "https://hg.mozilla.org/releases/mozilla-b2g32_v2_0",
"revision": "default",

1
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -1054,7 +1054,6 @@ or run without that action (ie: --no-{action})"
os.path.join(dirs['abs_src_dir'], '.mozconfig'))
self.info("mozconfig content:")
with open(abs_src_mozconfig) as mozconfig:
next(mozconfig)
for line in mozconfig:
self.info(line)
else:

17
testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
View File

@ -18,9 +18,10 @@ from mozharness.base.python import (
virtualenv_config_options,
)
from mozharness.mozilla.vcstools import VCSToolsScript
from mozharness.mozilla.purge import PurgeMixin
class FirefoxUITests(VCSToolsScript, VirtualenvMixin):
class FirefoxUITests(VCSToolsScript, VirtualenvMixin, PurgeMixin):
config_options = [
[['--firefox-ui-repo'], {
'dest': 'firefox_ui_repo',
@ -33,12 +34,22 @@ class FirefoxUITests(VCSToolsScript, VirtualenvMixin):
}],
] + copy.deepcopy(virtualenv_config_options)
def __init__(self, config_options=[], all_actions=[], **kwargs):
def __init__(self,
config={},
config_options=[],
all_actions=[],
**kwargs):
default_config = {
'purge_minsize': 2,
}
default_config.update(config)
self.config_options += config_options
if all_actions is None:
# Default actions
all_actions = [
'purge-builds',
'clobber',
'checkout',
'create-virtualenv',
@ -47,6 +58,8 @@ class FirefoxUITests(VCSToolsScript, VirtualenvMixin):
super(FirefoxUITests, self).__init__(
config_options=self.config_options,
require_config_file=True,
config=default_config,
all_actions=all_actions,
**kwargs
)

1
testing/mozharness/scripts/firefox_ui_updates.py
View File

@ -92,6 +92,7 @@ class FirefoxUIUpdates(FirefoxUITests):
super(FirefoxUIUpdates, self).__init__(
config_options=config_options,
all_actions=[
'purge-builds',
'clobber',
'checkout',
'create-virtualenv',

34
testing/mozharness/scripts/luciddream_unittest.py
View File

@ -228,26 +228,32 @@ class LuciddreamTest(TestingMixin, MercurialScript, MozbaseMixin, BaseScript,
ld_parser = self.parser_class(config=self.config,
log_obj=self.log_obj,
error_list=BaseErrorList)
raw_log = os.path.join(dirs['abs_work_dir'], 'luciddream_raw.log')
cmd = [self.query_python_path('python'),
os.path.join(ld_dir, 'luciddream', 'runluciddream.py'),
'--log-raw=%s' % raw_log
os.path.join(ld_dir, 'luciddream', 'runluciddream.py')
]
str_format_values = {
'browser_path': self.binary_path,
'raw_log_file': os.path.join(dirs['abs_work_dir'], 'luciddream_raw.log'),
'test_manifest': os.path.join(ld_dir, 'example-tests', 'luciddream.ini')
}
if self.config.get('emulator_url'):
cmd += ['--b2gpath', dirs['abs_b2g-distro_dir'],
'--browser-path', self.binary_path,
]
str_format_values['emulator_path'] = dirs['abs_b2g-distro_dir']
else:
if self.config.get('b2gdesktop_url'):
bin_path = os.path.join(dirs['abs_b2g_desktop'], 'b2g', 'b2g')
str_format_values['fxos_desktop_path'] = os.path.join(dirs['abs_b2g_desktop'], 'b2g', 'b2g')
else:
bin_path = self.config.get('b2gdesktop_path')
cmd += ['--b2g-desktop-path', bin_path,
'--browser-path', self.binary_path,
'--gaia-profile', os.path.join(dirs['abs_gaia_dir'], 'profile'),
]
cmd += [os.path.join(ld_dir, 'example-tests', 'luciddream.ini')]
str_format_values['fxos_desktop_path'] = self.config.get('b2gdesktop_path')
str_format_values['gaia_profile'] = os.path.join(dirs['abs_gaia_dir'], 'profile')
suite = 'luciddream-emulator' if self.config.get('emulator_url') else 'luciddream-b2gdt'
options = self.tree_config['suite_definitions'][suite]['options']
for option in options:
option = option % str_format_values
if not option.endswith('None'):
cmd.append(option)
code = self.run_command(cmd, env=env,
output_timeout=1000,