From f52d8364ffda3e185aa8dc5a5d698752649f62a8 Mon Sep 17 00:00:00 2001 From: "bhearsum%mozilla.com" Date: Fri, 21 Nov 2008 14:38:44 +0000 Subject: [PATCH] bug 460848: set up talos for Firefox 3.1 maintenance branch builds. r=ccooper,anodelman, patch=catlee git-svn-id: svn://10.0.0.236/trunk@255163 18797224-902f-48f8-a5cc-f745e15eee43 --- .../testing/talos/perfmaster/master.cfg | 326 +++++++++++++++++- 1 file changed, 323 insertions(+), 3 deletions(-) diff --git a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg index 7aa040c87e8..a23261d5c18 100644 --- a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg +++ b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg @@ -28,6 +28,11 @@ MAC_SEARCHSTRING="en-US.mac.dmg" LINUX_SEARCHSTRING="en-US.linux-i686.tar.bz2" LINUX_OLD_SEARCHSTRING="en-US.linux-i686.tar.gz" +#mozilla-1.9.1 +WIN32_MOZ191_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/mozilla-1.9.1-win32/"] +LINUX_MOZ191_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/mozilla-1.9.1-linux/"] +MAC_MOZ191_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/mozilla-1.9.1-macosx/"] + WIN32_MOZ2_CENTRAL_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/mozilla-central-win32/"] LINUX_MOZ2_CENTRAL_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/mozilla-central-linux/"] MAC_MOZ2_CENTRAL_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/mozilla-central-macosx/"] @@ -125,7 +130,30 @@ c['bots'] = [("qm-mini-xp01", "w1nd3rs"), ("qm-pleopard-trunk04", "mac1nt0sh"), ("qm-plinux-trunk07", "l1nux"), ("qm-pxp-trunk07", "w1nd3rs"), - ("qm-pvista-trunk04", "vist@")] + ("qm-pvista-trunk04", "vist@"), + ("qm-plinux-talos01", "l1nux"), + ("qm-plinux-talos02", "l1nux"), + ("qm-plinux-talos03", "l1nux"), + ("qm-plinux-talos04", "l1nux"), + ("qm-pxp-talos01", "w1nd3rs"), + ("qm-pxp-talos02", "w1nd3rs"), + ("qm-pxp-talos03", "w1nd3rs"), + ("qm-pxp-talos04", "w1nd3rs"), + ("qm-pvista-talos01", "vist@"), + ("qm-pvista-talos02", "vist@"), + ("qm-pvista-talos03", "vist@"), + ("qm-pvista-talos04", "vist@"), + ("qm-pmac-talos01", "mac1nt0sh"), + ("qm-pmac-talos02", "mac1nt0sh"), + ("qm-pmac-talos03", "mac1nt0sh"), + ("qm-pmac-talos04", "mac1nt0sh"), + ("qm-pleopard-talos01", "mac1nt0sh"), + ("qm-pleopard-talos02", "mac1nt0sh"), + ("qm-pleopard-talos03", "mac1nt0sh"), + ("qm-pleopard-talos04", "mac1nt0sh"), + ("qm-plinux-fast04", "l1nux"), + ("qm-pxp-fast04", "w1nd3rs"), + ("qm-pmac-fast04", "mac1nt0sh")] ## @@ -149,6 +177,29 @@ c['status'].append(MailNotifier( builders=None, # send for all builders relayhost="smtp.mozilla.org")) + +# this is the Firefox3.1 TinderboxMailNotifier +c['status'].append(TinderboxMailNotifier( + fromaddr="rcampbell@mozilla.com", + tree="Firefox3.1", + extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org",], + relayhost="smtp.mozilla.org", + builders=["WINNT 5.1 talos mozilla-1.9.1", + "WINNT 5.1 talos mozilla-1.9.1 nochrome", + "WINNT 6.0 talos mozilla-1.9.1", + "WINNT 6.0 talos mozilla-1.9.1 nochrome", + "Linux talos mozilla-1.9.1", + "Linux talos mozilla-1.9.1 nochrome", + "MacOSX Darwin 8.8.1 talos mozilla-1.9.1", + "MacOSX Darwin 8.8.1 talos mozilla-1.9.1 nochrome", + "MacOSX Darwin 9.2.2 talos mozilla-1.9.1", + "MacOSX Darwin 9.2.2 talos mozilla-1.9.1 nochrome", + "WINNT 5.1 talos mozilla-1.9.1 fast", + "Linux talos mozilla-1.9.1 fast", + "MacOSX Darwin 8.8.1 talos mozilla-1.9.1 fast"], + useChangeTime=True, + logCompression="bzip2")) + # this is the Firefox3.0 TinderboxMailNotifier c['status'].append(TinderboxMailNotifier( fromaddr="rcampbell@mozilla.com", @@ -266,7 +317,7 @@ c['sources'].append(FtpPoller( pollInterval = 10 * 60) ) -# firefox 3.1 +# mozilla-central c['sources'].append(FtpPoller( searchString = WIN32_SEARCHSTRING, tree = "Firefox", @@ -289,6 +340,28 @@ c['sources'].append(FtpPoller( pollInterval = 10 * 60) ) +# mozilla-1.9.1 +c['sources'].append(FtpPoller( + searchString = WIN32_SEARCHSTRING, + tree = "Firefox3.1", + branch = "MOZ191-WIN32", + ftpURLs = WIN32_MOZ191_BUILDDIRS, + pollInterval = 10 * 60) +) +c['sources'].append(FtpPoller( + searchString = LINUX_SEARCHSTRING, + tree = "Firefox3.1", + branch = "MOZ191-LINUX", + ftpURLs = LINUX_MOZ191_BUILDDIRS, + pollInterval = 10 * 60) +) +c['sources'].append(FtpPoller( + searchString = MAC_SEARCHSTRING, + tree = "Firefox3.1", + branch = "MOZ191-MAC", + ftpURLs = MAC_MOZ191_BUILDDIRS, + pollInterval = 10 * 60) + ## ## Schedulers ## @@ -326,6 +399,15 @@ c['schedulers'].append(Scheduler(name="moz2 central win32 scheduler", "WINNT 5.1 talos mozilla-central nochrome", "WINNT 6.0 talos mozilla-central nochrome"] )) +c['schedulers'].append(Scheduler(name="mozilla-1.9.1 win32 scheduler", + branch="MOZ191-WIN32", + treeStableTimer=5*60, + builderNames=["WINNT 5.1 talos mozilla-1.9.1", + "WINNT 5.1 talos mozilla-1.9.1 fast", + "WINNT 6.0 talos mozilla-1.9.1", + "WINNT 5.1 talos mozilla-1.9.1 nochrome", + "WINNT 6.0 talos mozilla-1.9.1 nochrome"] +)) ## LINUX c['schedulers'].append(Scheduler(name="head perfrun linux scheduler", branch="HEAD_LINUX", @@ -347,6 +429,13 @@ c['schedulers'].append(Scheduler(name="moz2 central perfrun linux scheduler", "Linux talos mozilla-central fast", "Linux talos mozilla-central nochrome"] )) +c['schedulers'].append(Scheduler(name="mozilla-1.9.1 perfrun linux scheduler", + branch="MOZ191-LINUX", + treeStableTimer=5*60, + builderNames=["Linux talos mozilla-1.9.1", + "Linux talos mozilla-1.9.1 fast", + "Linux talos mozilla-1.9.1 nochrome"] +)) ## MAC c['schedulers'].append(Scheduler(name="head perfrun scheduler mac", branch="HEAD-MAC", @@ -371,6 +460,16 @@ c['schedulers'].append(Scheduler(name="moz2 central perfrun mac scheduler", "MacOSX Darwin 8.8.1 talos mozilla-central nochrome", "MacOSX Darwin 9.2.2 talos mozilla-central nochrome"] )) +c['schedulers'].append(Scheduler(name="mozilla-1.9.1 perfrun mac scheduler", + branch="MOZ191-MAC", + treeStableTimer=5*60, + builderNames=["MacOSX Darwin 8.8.1 talos mozilla-1.9.1", + "MacOSX Darwin 8.8.1 talos mozilla-1.9.1 fast", + "MacOSX Darwin 9.2.2 talos mozilla-1.9.1", + "MacOSX Darwin 8.8.1 talos mozilla-1.9.1 nochrome", + "MacOSX Darwin 9.2.2 talos mozilla-1.9.1 nochrome"] +)) + # the 'builders' list defines the Builders. Each one is configured with a # dictionary, using the following keys: @@ -390,6 +489,15 @@ 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 @@ -459,6 +567,28 @@ win32_moz2_central_fast_steps = TalosFactory(OS = 'win', buildPath="..\\firefox\\firefox.exe", talosCmd=basicTalosCmd) +win32_moz191_steps = TalosFactory(OS = 'win', + envName='vc8perf', + buildBranch="1.9.1", + configOptions=stageBasicConfig, + buildPath="..\\firefox\\firefox.exe", + talosCmd=basicTalosCmd) + +win32_moz191_nochrome_steps = TalosFactory(OS = 'win', + envName='vc8perf', + buildBranch="1.9.1", + configOptions=stageNochromeConfig, + buildPath="..\\firefox\\firefox.exe", + talosCmd=basicTalosCmd) + +win32_moz191_fast_steps = TalosFactory(OS = 'win', + envName='vc8perf', + buildBranch="1.9.1", + configOptions=stageFastConfig, + customManifest=fastManifest, + buildPath="..\\firefox\\firefox.exe", + talosCmd=basicTalosCmd) + #VISTA vista_trunk_steps = TalosFactory(OS = 'win', envName='vc8perf', @@ -495,6 +625,20 @@ vista_moz2_central_nochrome_steps = TalosFactory(OS = 'win', buildPath="..\\firefox\\firefox.exe", talosCmd=basicTalosCmd) +vista_moz191_steps = TalosFactory(OS = 'win', + envName='vc8perf', + buildBranch="1.9.1", + configOptions=stageBasicConfig, + buildPath="..\\firefox\\firefox.exe", + talosCmd=basicTalosCmd) + +vista_moz191_nochrome_steps = TalosFactory(OS = 'win', + envName='vc8perf', + buildBranch="1.9.1", + configOptions=stageNochromeConfig, + buildPath="..\\firefox\\firefox.exe", + talosCmd=basicTalosCmd) + #LINUX linux_trunk_steps = TalosFactory(OS = 'linux', envName='linux', @@ -555,6 +699,28 @@ linux_moz2_central_fast_steps = TalosFactory(OS = 'linux', buildPath="../firefox/firefox", talosCmd=basicTalosCmd) +linux_moz191_steps = TalosFactory(OS = 'linux', + envName='linux', + buildBranch="1.9.1", + configOptions=stageBasicConfig, + buildPath="../firefox/firefox", + talosCmd=basicTalosCmd) + +linux_moz191_nochrome_steps = TalosFactory(OS = 'linux', + envName='linux', + buildBranch="1.9.1", + configOptions=stageNochromeConfig, + buildPath="../firefox/firefox", + talosCmd=basicTalosCmd) + +linux_moz191_fast_steps = TalosFactory(OS = 'linux', + envName='linux', + buildBranch="1.9.1", + configOptions=stageFastConfig, + customManifest=fastManifest, + buildPath="../firefox/firefox", + talosCmd=basicTalosCmd) + #MAC mac_trunk_steps = TalosFactory(OS = 'tiger', envName='mac', @@ -636,6 +802,42 @@ mac_moz2_central_fast_steps = TalosFactory(OS = 'tiger', buildPath="../Minefield.app/Contents/MacOS/firefox", talosCmd=basicTalosCmd) +mac_moz191_steps = TalosFactory(OS = 'tiger', + envName='mac', + buildBranch="1.9.1", + configOptions=stageBasicConfig, + buildPath="../Minefield.app/Contents/MacOS/firefox", + talosCmd=basicTalosCmd) + +mac_moz191_nochrome_steps = TalosFactory(OS = 'tiger', + envName='mac', + buildBranch="1.9.1", + configOptions=stageNochromeConfig, + buildPath="../Minefield.app/Contents/MacOS/firefox", + talosCmd=basicTalosCmd) + +leopard_moz191_steps = TalosFactory(OS = 'leopard', + envName='mac', + buildBranch="1.9.1", + configOptions=stageBasicConfig, + buildPath="../Minefield.app/Contents/MacOS/firefox", + talosCmd=basicTalosCmd) + +leopard_moz191_nochrome_steps = TalosFactory(OS = 'leopard', + envName='mac', + buildBranch="1.9.1", + configOptions=stageNochromeConfig, + buildPath="../Minefield.app/Contents/MacOS/firefox", + talosCmd=basicTalosCmd) + +mac_moz191_fast_steps = TalosFactory(OS = 'tiger', + envName='mac', + buildBranch="1.9.1", + configOptions=stageFastConfig, + customManifest=fastManifest, + buildPath="../Minefield.app/Contents/MacOS/firefox", + talosCmd=basicTalosCmd) + win32_trunk_builder = { 'name': "WINNT 5.1 mini talos trunk", 'slavenames': ['qm-mini-xp01', 'qm-mini-xp02', 'qm-mini-xp03'], @@ -708,6 +910,30 @@ win32_moz2_central_fast_builder = { 'category': "Moz2" } +win32_moz191_builder = { + 'name': "WINNT 5.1 talos mozilla-1.9.1", + 'slavenames': ['qm-pxp-talos01', 'qm-pxp-talos02', 'qm-pxp-talos03'] + 'builddir': "win32-moz191", + 'factory': win32_moz191_steps, + 'category': "Moz191" +} + +win32_moz191_nochrome_builder = { + 'name': "WINNT 5.1 talos mozilla-1.9.1 nochrome", + 'slavenames': ['qm-pxp-talos04'], + 'builddir': "win32-moz191-nochrome", + 'factory': win32_moz191_nochrome_steps, + 'category': "Moz191" +} + +win32_moz191_fast_builder = { + 'name': "WINNT 5.1 talos mozilla-1.9.1 fast", + 'slavenames': ['qm-pxp-fast04'], + 'builddir': "win32-moz191-fast", + 'factory': win32_moz191_fast_steps, + 'category': "Moz191" +} + vista_trunk_builder = { 'name': "WINNT 6.0 talos trunk", 'slavenames': ['qm-mini-vista01', 'qm-mini-vista02', 'qm-mini-vista03'], @@ -740,6 +966,22 @@ vista_moz2_central_nochrome_builder = { 'category': "Moz2" } +vista_moz191_builder = { + 'name': "WINNT 6.0 talos mozilla-1.9.1", + 'slavenames': ['qm-pvista-talos01', 'qm-pvista-talos02', 'qm-pvista-talos03'] + 'builddir': "vista-moz191", + 'factory': vista_moz191_steps, + 'category': "Moz191" +} + +vista_moz191_nochrome_builder = { + 'name': "WINNT 6.0 talos mozilla-1.9.1 nochrome", + 'slavenames': ['qm-pvista-talos04'], + 'builddir': "vista-moz191-nochrome", + 'factory': vista_moz191_nochrome_steps, + 'category': "Moz191" +} + vista_branch_builder = { 'name': "WINNT 6.0 talos branch", 'slavenames': ['qm-mini-vista04'], @@ -812,6 +1054,30 @@ linux_moz2_central_fast_builder = { 'category': "Moz2" } +linux_moz191_builder = { + 'name': "Linux talos mozilla-1.9.1", + 'slavenames': ['qm-plinux-talos01', 'qm-plinux-talos02', 'qm-plinux-talos03'] + 'builddir': "linux-moz191", + 'factory': linux_moz191_steps, + 'category': "Moz191" +} + +linux_moz191_nochrome_builder = { + 'name': "Linux talos mozilla-1.9.1 nochrome", + 'slavenames': ['qm-plinux-talos04'], + 'builddir': "linux-moz191-nochrome", + 'factory': linux_moz191_nochrome_steps, + 'category': "Moz191" +} + +linux_moz191_fast_builder = { + 'name': "Linux talos mozilla-1.9.1 fast", + 'slavenames': ['qm-plinux-fast04'], + 'builddir': "linux-moz191-fast", + 'factory': linux_moz191_fast_steps, + 'category': "Moz191" +} + mac_trunk_builder = { 'name': "MacOSX Darwin 8.8.1 talos trunk", 'slavenames': ['qm-pmac01', 'qm-pmac02', 'qm-pmac03'], @@ -860,6 +1126,22 @@ leopard_moz2_central_nochrome_builder = { 'category': "Moz2" } +leopard_moz191_builder = { + 'name': "MacOSX Darwin 9.2.2 talos mozilla-1.9.1", + 'slavenames': ['qm-pleopard-talos01', 'qm-pleopard-talos02', 'qm-pleopard-talos03'] + 'builddir': "leopard-moz191", + 'factory': leopard_moz191_steps, + 'category': "Moz191" +} + +leopard_moz191_nochrome_builder = { + 'name': "MacOSX Darwin 9.2.2 talos mozilla-1.9.1 nochrome", + 'slavenames': ['qm-pleopard-talos04'], + 'builddir': "leopard-moz191-nochrome", + 'factory': leopard_moz191_nochrome_steps, + 'category': "Moz191" +} + mac_branch_builder = { 'name': "MacOSX Darwin 8.8.1 talos branch", 'slavenames': ['qm-pmac04'], @@ -890,7 +1172,7 @@ mac_moz2_central_nochrome_builder = { 'builddir': "mac-moz2-central-nochrome", 'factory': mac_moz2_central_nochrome_steps, 'category': "Moz2" -} +} mac_moz2_central_fast_builder = { 'name': "MacOSX Darwin 8.8.1 talos mozilla-central fast", @@ -900,6 +1182,30 @@ mac_moz2_central_fast_builder = { 'category': "Moz2" } +mac_moz191_builder = { + 'name': "MacOSX Darwin 8.8.1 talos mozilla-1.9.1", + 'slavenames': ['qm-pmac-talos01', 'qm-pmac-talos02', 'qm-pmac-talos03'] + 'builddir': "mac-moz191", + 'factory': mac_moz191_steps, + 'category': "Moz191" +} + +mac_moz191_nochrome_builder = { + 'name': "MacOSX Darwin 8.8.1 talos mozilla-1.9.1 nochrome", + 'slavenames': ['qm-pmac-talos04'], + 'builddir': "mac-moz191-nochrome", + 'factory': mac_moz191_nochrome_steps, + 'category': "Moz191" +} + +mac_moz191_fast_builder = { + 'name': "MacOSX Darwin 8.8.1 talos mozilla-1.9.1 fast", + 'slavenames': ['qm-pmac-fast04'], + 'builddir': "mac-moz191-fast", + 'factory': mac_moz191_fast_steps, + 'category': "Moz191" +} + c['builders'] = [] c['builders'].append(win32_trunk_builder) @@ -938,3 +1244,17 @@ c['builders'].append(vista_moz2_central_nochrome_builder) c['builders'].append(linux_moz2_central_nochrome_builder) c['builders'].append(mac_moz2_central_nochrome_builder) c['builders'].append(leopard_moz2_central_nochrome_builder) +#mozilla-1.9.1 +c['builders'].append(win32_moz191_builder) +c['builders'].append(linux_moz191_builder) +c['builders'].append(mac_moz191_builder) +c['builders'].append(vista_moz191_builder) +c['builders'].append(leopard_moz191_builder) +c['builders'].append(win32_moz191_fast_builder) +c['builders'].append(linux_moz191_fast_builder) +c['builders'].append(mac_moz191_fast_builder) +c['builders'].append(win32_moz191_nochrome_builder) +c['builders'].append(vista_moz191_nochrome_builder) +c['builders'].append(linux_moz191_nochrome_builder) +c['builders'].append(mac_moz191_nochrome_builder) +c['builders'].append(leopard_moz191_nochrome_builder)