From 4342afbdb21f022f400e0ed532e17134bb18b076 Mon Sep 17 00:00:00 2001 From: "anodelman%mozilla.com" Date: Fri, 21 Nov 2008 19:22:59 +0000 Subject: [PATCH] Bug 460848 (set up talos for Firefox 3.1 branch/repo) p=anodelman, r=ccooper/catlee git-svn-id: svn://10.0.0.236/trunk@255168 18797224-902f-48f8-a5cc-f745e15eee43 --- .../testing/talos/perfmaster/master.cfg | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg index 9855d2ea6df..a3119862b84 100644 --- a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg +++ b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg @@ -490,15 +490,6 @@ jssConfig = graphConfig + ['--activeTests', 'ts:twinopen:tjss:tsspider'] fastConfig = graphConfig + ['--activeTests', 'ts:tp:tdhtml:twinopen:tsspider'] fastManifest = 'configs/historic_manifest.txt' -stageGraphConfig = ['--resultsServer', 'graphs-stage.mozilla.org', '--resultsLink', '/server/bulk.cgi'] - -stageBasicConfig = stageGraphConfig + ['--activeTests', 'ts:tp:tdhtml:tsvg:twinopen:tsspider:tgfx'] -stageBranchConfig = stageGraphConfig + ['--activeTests', 'ts:tp:tdhtml:tsvg:twinopen:tsspider'] -stageNochromeConfig = stageGraphConfig + ['--activeTests', 'ts:tp:tdhtml:tsvg:twinopen:tsspider:tgfx', '--noChrome'] -stageJssConfig = stageGraphConfig + ['--activeTests', 'ts:twinopen:tjss:tsspider'] -stageFastConfig = stageGraphConfig + ['--activeTests', 'ts:tp:tdhtml:twinopen:tsspider'] -stageFastManifest = 'configs/historic_manifest.txt' - basicTalosCmd = ['python', 'run_tests.py', '--noisy'] #WIN @@ -571,21 +562,21 @@ win32_moz2_central_fast_steps = TalosFactory(OS = 'win', win32_moz191_steps = TalosFactory(OS = 'win', envName='vc8perf', buildBranch="1.9.1", - configOptions=stageBasicConfig, + configOptions=basicConfig, buildPath="..\\firefox\\firefox.exe", talosCmd=basicTalosCmd) win32_moz191_nochrome_steps = TalosFactory(OS = 'win', envName='vc8perf', buildBranch="1.9.1", - configOptions=stageNochromeConfig, + configOptions=nochromeConfig, buildPath="..\\firefox\\firefox.exe", talosCmd=basicTalosCmd) win32_moz191_fast_steps = TalosFactory(OS = 'win', envName='vc8perf', buildBranch="1.9.1", - configOptions=stageFastConfig, + configOptions=fastConfig, customManifest=fastManifest, buildPath="..\\firefox\\firefox.exe", talosCmd=basicTalosCmd) @@ -629,14 +620,14 @@ vista_moz2_central_nochrome_steps = TalosFactory(OS = 'win', vista_moz191_steps = TalosFactory(OS = 'win', envName='vc8perf', buildBranch="1.9.1", - configOptions=stageBasicConfig, + configOptions=basicConfig, buildPath="..\\firefox\\firefox.exe", talosCmd=basicTalosCmd) vista_moz191_nochrome_steps = TalosFactory(OS = 'win', envName='vc8perf', buildBranch="1.9.1", - configOptions=stageNochromeConfig, + configOptions=nochromeConfig, buildPath="..\\firefox\\firefox.exe", talosCmd=basicTalosCmd) @@ -703,21 +694,21 @@ linux_moz2_central_fast_steps = TalosFactory(OS = 'linux', linux_moz191_steps = TalosFactory(OS = 'linux', envName='linux', buildBranch="1.9.1", - configOptions=stageBasicConfig, + configOptions=basicConfig, buildPath="../firefox/firefox", talosCmd=basicTalosCmd) linux_moz191_nochrome_steps = TalosFactory(OS = 'linux', envName='linux', buildBranch="1.9.1", - configOptions=stageNochromeConfig, + configOptions=nochromeConfig, buildPath="../firefox/firefox", talosCmd=basicTalosCmd) linux_moz191_fast_steps = TalosFactory(OS = 'linux', envName='linux', buildBranch="1.9.1", - configOptions=stageFastConfig, + configOptions=fastConfig, customManifest=fastManifest, buildPath="../firefox/firefox", talosCmd=basicTalosCmd) @@ -806,35 +797,35 @@ mac_moz2_central_fast_steps = TalosFactory(OS = 'tiger', mac_moz191_steps = TalosFactory(OS = 'tiger', envName='mac', buildBranch="1.9.1", - configOptions=stageBasicConfig, + configOptions=basicConfig, buildPath="../Minefield.app/Contents/MacOS/firefox", talosCmd=basicTalosCmd) mac_moz191_nochrome_steps = TalosFactory(OS = 'tiger', envName='mac', buildBranch="1.9.1", - configOptions=stageNochromeConfig, + configOptions=nochromeConfig, buildPath="../Minefield.app/Contents/MacOS/firefox", talosCmd=basicTalosCmd) leopard_moz191_steps = TalosFactory(OS = 'leopard', envName='mac', buildBranch="1.9.1", - configOptions=stageBasicConfig, + configOptions=basicConfig, buildPath="../Minefield.app/Contents/MacOS/firefox", talosCmd=basicTalosCmd) leopard_moz191_nochrome_steps = TalosFactory(OS = 'leopard', envName='mac', buildBranch="1.9.1", - configOptions=stageNochromeConfig, + configOptions=nochromeConfig, buildPath="../Minefield.app/Contents/MacOS/firefox", talosCmd=basicTalosCmd) mac_moz191_fast_steps = TalosFactory(OS = 'tiger', envName='mac', buildBranch="1.9.1", - configOptions=stageFastConfig, + configOptions=fastConfig, customManifest=fastManifest, buildPath="../Minefield.app/Contents/MacOS/firefox", talosCmd=basicTalosCmd)