mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 23:35:34 +00:00
Bug 1506310: Remove unused branch_name passed from taskcluster to talos; r=jmaher
Differential Revision: https://phabricator.services.mozilla.com/D12076 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Tom Prince
parent
d1c904d968
commit
06b5b2f153
@ -500,12 +500,6 @@ def setup_talos(config, tests):
|
||||
extra_options.append('--add-option')
|
||||
extra_options.append('--setpref,gfx.direct2d.disabled=true')
|
||||
|
||||
# Per https://bugzilla.mozilla.org/show_bug.cgi?id=1357753#c3, branch
|
||||
# name is only required for try
|
||||
if test['suite'] == 'talos' and config.params.is_try():
|
||||
extra_options.append('--branch-name')
|
||||
extra_options.append('try')
|
||||
|
||||
yield test
|
||||
|
||||
|
||||
@ -519,12 +513,6 @@ def setup_raptor(config, tests):
|
||||
|
||||
extra_options = test.setdefault('mozharness', {}).setdefault('extra-options', [])
|
||||
|
||||
# Per https://bugzilla.mozilla.org/show_bug.cgi?id=1357753#c3, branch
|
||||
# name is only required for try
|
||||
if config.params.is_try():
|
||||
extra_options.append('--branch-name')
|
||||
extra_options.append('try')
|
||||
|
||||
if config.params['project'] in ('mozilla-beta', 'mozilla-release') or \
|
||||
config.params['project'].startswith('mozilla-esr'):
|
||||
extra_options.append('--is-release-build')
|
||||
|
||||
@ -61,12 +61,6 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin):
|
||||
"dest": "app",
|
||||
"help": "name of the application we are testing (default: firefox)"
|
||||
}],
|
||||
[["--branch-name"],
|
||||
{"action": "store",
|
||||
"dest": "branch",
|
||||
"help": "branch running against. Used by Talos when running on try. "
|
||||
"See https://bugzilla.mozilla.org/show_bug.cgi?id=1357753#c3"
|
||||
}],
|
||||
[["--is-release-build"],
|
||||
{"action": "store_true",
|
||||
"dest": "is_release_build",
|
||||
|
||||
@ -113,11 +113,6 @@ class Talos(TestingMixin, MercurialScript, TooltoolMixin,
|
||||
"dest": "suite",
|
||||
"help": "Talos suite to run (from talos json)"
|
||||
}],
|
||||
[["--branch-name"],
|
||||
{"action": "store",
|
||||
"dest": "branch",
|
||||
"help": "Graphserver branch to report to"
|
||||
}],
|
||||
[["--system-bits"],
|
||||
{"action": "store",
|
||||
"dest": "system_bits",
|
||||
@ -344,8 +339,6 @@ class Talos(TestingMixin, MercurialScript, TooltoolMixin,
|
||||
kw_options['suite'] = "%s-e10s" % self.config['suite']
|
||||
if self.config.get('title'):
|
||||
kw_options['title'] = self.config['title']
|
||||
if self.config.get('branch'):
|
||||
kw_options['branchName'] = self.config['branch']
|
||||
if self.symbols_path:
|
||||
kw_options['symbolsPath'] = self.symbols_path
|
||||
# if using mitmproxy, we've already created a py3 venv just
|
||||
|
||||
@ -60,8 +60,6 @@ def create_parser(mach_interface=False):
|
||||
help="path to executable we are testing")
|
||||
add_arg('-t', '--title', default='qm-pxp01',
|
||||
help="Title of the test run")
|
||||
add_arg('--branchName', dest="branch_name", default='',
|
||||
help="Name of the branch we are testing on")
|
||||
add_arg('--browserWait', dest='browser_wait', default=5, type=int,
|
||||
help="Amount of time allowed for the browser to cleanly close")
|
||||
add_arg('-a', '--activeTests',
|
||||
|
||||
@ -293,7 +293,6 @@ def get_browser_config(config):
|
||||
required = ('extensions', 'browser_path', 'browser_wait',
|
||||
'extra_args', 'buildid', 'env', 'init_url', 'webserver')
|
||||
optional = {'bcontroller_config': '${talos}/bcontroller.json',
|
||||
'branch_name': '',
|
||||
'child_process': 'plugin-container',
|
||||
'debug': False,
|
||||
'debugger': None,
|
||||
|
||||
@ -120,7 +120,6 @@ class Test_get_browser_config(object):
|
||||
required = ('extensions', 'browser_path', 'browser_wait',
|
||||
'extra_args', 'buildid', 'env', 'init_url', 'webserver')
|
||||
optional = ['bcontroller_config',
|
||||
'branch_name',
|
||||
'child_process',
|
||||
'debug',
|
||||
'debugger',
|
||||
|
||||
@ -1 +1 @@
|
||||
{'deviceroot': '', 'dirs': {}, 'repository': 'https://hg.mozilla.org/releases/mozilla-release', 'buildid': '20131205075310', 'results_log': 'pathtoresults_log', 'symbols_path': None, 'bcontroller_config': 'pathtobcontroller', 'host': '', 'browser_name': 'Firefox', 'sourcestamp': '39faf812aaec', 'remote': False, 'child_process': 'plugin-container', 'branch_name': '', 'browser_version': '26.0', 'extra_args': '', 'develop': True, 'preferences': {'browser.display.overlaynavbuttons': False, 'extensions.getAddons.get.url': 'http://127.0.0.1/extensions-dummy/repositoryGetURL', 'dom.max_chrome_script_run_time': 0, 'network.proxy.type': 1, 'extensions.update.background.url': 'http://127.0.0.1/extensions-dummy/updateBackgroundURL', 'network.proxy.http': 'localhost', 'plugins.update.url': 'http://127.0.0.1/plugins-dummy/updateCheckURL', 'dom.max_script_run_time': 0, 'extensions.update.enabled': False, 'browser.safebrowsing.keyURL': 'http://127.0.0.1/safebrowsing-dummy/newkey', 'media.navigator.permission.disabled': True, 'app.update.checkInstallTime': False, 'app.update.disabledForTesting': True, 'extensions.blocklist.url': 'http://127.0.0.1/extensions-dummy/blocklistURL', 'browser.EULA.override': True, 'extensions.checkCompatibility': False, 'talos.logfile': 'pathtofile', 'browser.safebrowsing.gethashURL': 'http://127.0.0.1/safebrowsing-dummy/gethash', 'extensions.hotfix.url': 'http://127.0.0.1/extensions-dummy/hotfixURL', 'dom.disable_window_move_resize': True, 'network.proxy.http_port': 80, 'browser.dom.window.dump.enabled': True, 'extensions.update.url': 'http://127.0.0.1/extensions-dummy/updateURL', 'browser.chrome.dynamictoolbar': False, 'browser.link.open_newwindow': 2, 'browser.cache.disk.smart_size.first_run': False, 'security.turn_off_all_security_so_that_viruses_can_take_over_this_computer': True, 'dom.disable_open_during_load': False, 'extensions.getAddons.search.browseURL': 'http://127.0.0.1/extensions-dummy/repositoryBrowseURL', 'browser.cache.disk.smart_size.enabled': False, 'extensions.getAddons.getWithPerformance.url': 'http://127.0.0.1/extensions-dummy/repositoryGetWithPerformanceURL', 'hangmonitor.timeout': 0, 'dom.send_after_paint_to_content': True, 'security.fileuri.strict_origin_policy': False, 'media.capturestream_hints.enabled': True, 'extensions.update.notifyUser': False, 'extensions.blocklist.enabled': False, 'browser.bookmarks.max_backups': 0, 'browser.shell.checkDefaultBrowser': False, 'media.peerconnection.enabled': True, 'dom.disable_window_flip': True, 'security.enable_java': False, 'browser.warnOnQuit': False, 'media.navigator.enabled': True, 'browser.safebrowsing.updateURL': 'http://127.0.0.1/safebrowsing-dummy/update', 'dom.allow_scripts_to_close_windows': True, 'extensions.webservice.discoverURL': 'http://127.0.0.1/extensions-dummy/discoveryURL'}, 'test_timeout': 1200, 'title': 'qm-pxp01', 'error_filename': 'pathtoerrorfile', 'webserver': 'localhost:15707', 'browser_path':ffox_path, 'port': 20701, 'browser_log': 'browser_output.txt', 'process': 'firefox.exe', 'xperf_path': 'C:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe', 'extensions': ['pathtopageloader'], 'fennecIDs': '', 'init_url': 'http://localhost:15707/getInfo.html', 'browser_wait': 5}
|
||||
{'deviceroot': '', 'dirs': {}, 'repository': 'https://hg.mozilla.org/releases/mozilla-release', 'buildid': '20131205075310', 'results_log': 'pathtoresults_log', 'symbols_path': None, 'bcontroller_config': 'pathtobcontroller', 'host': '', 'browser_name': 'Firefox', 'sourcestamp': '39faf812aaec', 'remote': False, 'child_process': 'plugin-container', 'browser_version': '26.0', 'extra_args': '', 'develop': True, 'preferences': {'browser.display.overlaynavbuttons': False, 'extensions.getAddons.get.url': 'http://127.0.0.1/extensions-dummy/repositoryGetURL', 'dom.max_chrome_script_run_time': 0, 'network.proxy.type': 1, 'extensions.update.background.url': 'http://127.0.0.1/extensions-dummy/updateBackgroundURL', 'network.proxy.http': 'localhost', 'plugins.update.url': 'http://127.0.0.1/plugins-dummy/updateCheckURL', 'dom.max_script_run_time': 0, 'extensions.update.enabled': False, 'browser.safebrowsing.keyURL': 'http://127.0.0.1/safebrowsing-dummy/newkey', 'media.navigator.permission.disabled': True, 'app.update.checkInstallTime': False, 'app.update.disabledForTesting': True, 'extensions.blocklist.url': 'http://127.0.0.1/extensions-dummy/blocklistURL', 'browser.EULA.override': True, 'extensions.checkCompatibility': False, 'talos.logfile': 'pathtofile', 'browser.safebrowsing.gethashURL': 'http://127.0.0.1/safebrowsing-dummy/gethash', 'extensions.hotfix.url': 'http://127.0.0.1/extensions-dummy/hotfixURL', 'dom.disable_window_move_resize': True, 'network.proxy.http_port': 80, 'browser.dom.window.dump.enabled': True, 'extensions.update.url': 'http://127.0.0.1/extensions-dummy/updateURL', 'browser.chrome.dynamictoolbar': False, 'browser.link.open_newwindow': 2, 'browser.cache.disk.smart_size.first_run': False, 'security.turn_off_all_security_so_that_viruses_can_take_over_this_computer': True, 'dom.disable_open_during_load': False, 'extensions.getAddons.search.browseURL': 'http://127.0.0.1/extensions-dummy/repositoryBrowseURL', 'browser.cache.disk.smart_size.enabled': False, 'extensions.getAddons.getWithPerformance.url': 'http://127.0.0.1/extensions-dummy/repositoryGetWithPerformanceURL', 'hangmonitor.timeout': 0, 'dom.send_after_paint_to_content': True, 'security.fileuri.strict_origin_policy': False, 'media.capturestream_hints.enabled': True, 'extensions.update.notifyUser': False, 'extensions.blocklist.enabled': False, 'browser.bookmarks.max_backups': 0, 'browser.shell.checkDefaultBrowser': False, 'media.peerconnection.enabled': True, 'dom.disable_window_flip': True, 'security.enable_java': False, 'browser.warnOnQuit': False, 'media.navigator.enabled': True, 'browser.safebrowsing.updateURL': 'http://127.0.0.1/safebrowsing-dummy/update', 'dom.allow_scripts_to_close_windows': True, 'extensions.webservice.discoverURL': 'http://127.0.0.1/extensions-dummy/discoveryURL'}, 'test_timeout': 1200, 'title': 'qm-pxp01', 'error_filename': 'pathtoerrorfile', 'webserver': 'localhost:15707', 'browser_path':ffox_path, 'port': 20701, 'browser_log': 'browser_output.txt', 'process': 'firefox.exe', 'xperf_path': 'C:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe', 'extensions': ['pathtopageloader'], 'fennecIDs': '', 'init_url': 'http://localhost:15707/getInfo.html', 'browser_wait': 5}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user