From 3fdfae264e170bce6ae603cfc981d1910b441ea7 Mon Sep 17 00:00:00 2001 From: "anodelman%mozilla.com" Date: Wed, 3 Dec 2008 00:39:52 +0000 Subject: [PATCH] Bug 463325 - mothball all 7 talos machines on FF2.0 p=anodelman, r=catlee git-svn-id: svn://10.0.0.236/trunk@255306 18797224-902f-48f8-a5cc-f745e15eee43 --- .../testing/talos/perfmaster/master.cfg | 178 ------------------ 1 file changed, 178 deletions(-) diff --git a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg index eb8b2d49d44..1b9c798635b 100644 --- a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg +++ b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg @@ -40,10 +40,6 @@ MAC_MOZ2_CENTRAL_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tind WIN32_TRUNK_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/FX-WIN32-TBOX-mozilla1.9.0/", "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0/"] LINUX_TRUNK_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/fx-linux-tbox-mozilla1.9.0/", "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0/"] MAC_TRUNK_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/bm-xserve08-mozilla1.9.0/", "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0/"] -#1.8 -WIN32_BRANCH_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/production-pacifica-vm02-mozilla1.8/", "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/"] -LINUX_BRANCH_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/production-prometheus-vm02-mozilla1.8/", "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/"] -MAC_BRANCH_BUILDDIRS=["http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/bm-xserve05-mozilla1.8/", "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/"] # This is the dictionary that the buildmaster pays attention to. We also use # a shorter alias to save typing. @@ -222,22 +218,6 @@ c['status'].append(TinderboxMailNotifier( useChangeTime=True, logCompression="bzip2")) -# this is the Mozilla1.8 TinderboxMailNotifier -c['status'].append(TinderboxMailNotifier( - fromaddr="rcampbell@mozilla.com", - tree="Mozilla1.8", - extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org",], - relayhost="smtp.mozilla.org", - builders=["WINNT 5.1 mini talos branch", - "WINNT 5.1 mini talos branch fast", - "WINNT 6.0 talos branch", - "Linux talos branch", - "Linux talos branch fast", - "MacOSX Darwin 8.8.1 talos branch", - "MacOSX Darwin 8.8.1 talos branch fast"], - useChangeTime=True, - logCompression="bzip2")) - # this is the Firefox TinderboxMailNotifier c['status'].append(TinderboxMailNotifier( fromaddr="rcampbell@mozilla.com", @@ -270,30 +250,6 @@ from ftppoller import FtpPoller c['sources'] = [] -#1.8 - -c['sources'].append(FtpPoller( - searchString = WIN32_SEARCHSTRING, - tree = "Mozilla1.8", - branch = "BRANCH_1_8", - ftpURLs = WIN32_BRANCH_BUILDDIRS, - pollInterval = 10 * 60) -) -c['sources'].append(FtpPoller( - searchString = LINUX_OLD_SEARCHSTRING, - tree = "Mozilla1.8", - branch = "BRANCH_LINUX", - ftpURLs = LINUX_BRANCH_BUILDDIRS, - pollInterval = 10 * 60) -) -c['sources'].append(FtpPoller( - searchString = MAC_SEARCHSTRING, - tree = "Mozilla1.8", - branch = "BRANCH-MAC", - ftpURLs = MAC_BRANCH_BUILDDIRS, - pollInterval = 10 * 60) -) - #1.9 c['sources'].append(FtpPoller( searchString = WIN32_SEARCHSTRING, @@ -384,13 +340,6 @@ c['schedulers'].append(Scheduler(name="head perfrun scheduler", "WINNT 5.1 mini talos trunk fast", "WINNT 6.0 talos trunk nochrome"] )) -c['schedulers'].append(Scheduler(name="branch perfrun scheduler", - branch="BRANCH_1_8", - treeStableTimer=5*60, - builderNames=["WINNT 5.1 mini talos branch", - "WINNT 5.1 mini talos branch fast", - "WINNT 6.0 talos branch"] -)) c['schedulers'].append(Scheduler(name="moz2 central win32 scheduler", branch="MOZ2-WIN32-CENTRAL", treeStableTimer=5*60, @@ -417,12 +366,6 @@ c['schedulers'].append(Scheduler(name="head perfrun linux scheduler", "Linux talos trunk nochrome", "Linux talos trunk fast"] )) -c['schedulers'].append(Scheduler(name="branch perfrun linux scheduler", - branch="BRANCH_LINUX", - treeStableTimer=5*60, - builderNames=["Linux talos branch", - "Linux talos branch fast"] -)) c['schedulers'].append(Scheduler(name="moz2 central perfrun linux scheduler", branch="MOZ2-LINUX-CENTRAL", treeStableTimer=5*60, @@ -446,12 +389,6 @@ c['schedulers'].append(Scheduler(name="head perfrun scheduler mac", "MacOSX Darwin 8.8.1 talos trunk fast", "MacOSX Darwin 9.2.2 talos trunk"] )) -c['schedulers'].append(Scheduler(name="branch perfrun scheduler mac", - branch="BRANCH-MAC", - treeStableTimer=5*60, - builderNames=["MacOSX Darwin 8.8.1 talos branch", - "MacOSX Darwin 8.8.1 talos branch fast"] -)) c['schedulers'].append(Scheduler(name="moz2 central perfrun mac scheduler", branch="MOZ2-MAC-CENTRAL", treeStableTimer=5*60, @@ -522,21 +459,6 @@ win32_trunk_jss_steps = TalosFactory(OS = 'win', buildPath="..\\firefox\\firefox.exe", talosCmd=basicTalosCmd) -win32_branch_steps = TalosFactory(OS = 'win', - envName='vc8perf', - buildBranch="1.8", - configOptions=branchConfig, - buildPath="..\\firefox\\firefox.exe", - talosCmd=basicTalosCmd) - -win32_branch_fast_steps = TalosFactory(OS = 'win', - envName='vc8perf', - buildBranch="1.8", - configOptions=fastConfig, - customManifest=fastManifest, - buildPath="..\\firefox\\firefox.exe", - talosCmd=basicTalosCmd) - win32_moz2_central_steps = TalosFactory(OS = 'win', envName='vc8perf', buildBranch="1.9.2", @@ -596,13 +518,6 @@ vista_trunk_nochrome_steps = TalosFactory(OS = 'win', buildPath="..\\firefox\\firefox.exe", talosCmd=basicTalosCmd) -vista_branch_steps = TalosFactory(OS = 'win', - envName='vc8perf', - buildBranch="1.8", - configOptions=branchConfig, - buildPath="..\\firefox\\firefox.exe", - talosCmd=basicTalosCmd) - vista_moz2_central_steps = TalosFactory(OS = 'win', envName='vc8perf', buildBranch="1.9.2", @@ -654,21 +569,6 @@ linux_trunk_fast_steps = TalosFactory(OS = 'linux', buildPath="../firefox/firefox", talosCmd=basicTalosCmd) -linux_branch_steps = TalosFactory(OS = 'linuxbranch', - envName='linux', - buildBranch="1.8", - configOptions=branchConfig, - buildPath="../firefox/firefox", - talosCmd=basicTalosCmd) - -linux_branch_fast_steps = TalosFactory(OS = 'linuxbranch', - envName='linux', - buildBranch="1.8", - configOptions=fastConfig, - customManifest=fastManifest, - buildPath="../firefox/firefox", - talosCmd=basicTalosCmd) - linux_moz2_central_steps = TalosFactory(OS = 'linux', envName='linux', buildBranch="1.9.2", @@ -743,21 +643,6 @@ leopard_trunk_steps = TalosFactory(OS = 'leopard', buildPath="../GranParadiso.app/Contents/MacOS/firefox", talosCmd=basicTalosCmd) -mac_branch_steps = TalosFactory(OS = 'tiger', - envName='mac', - buildBranch="1.8", - configOptions=branchConfig, - buildPath="../BonEcho.app/Contents/MacOS/firefox", - talosCmd=basicTalosCmd) - -mac_branch_fast_steps = TalosFactory(OS = 'tiger', - envName='mac', - buildBranch="1.8", - configOptions=fastConfig, - customManifest=fastManifest, - buildPath="../BonEcho.app/Contents/MacOS/firefox", - talosCmd=basicTalosCmd) - mac_moz2_central_steps = TalosFactory(OS = 'tiger', envName='mac', buildBranch="1.9.2", @@ -862,22 +747,6 @@ win32_trunk_jss_builder = { 'category': "Firefox Trunk" } -win32_branch_builder = { - 'name': "WINNT 5.1 mini talos branch", - 'slavenames': ['qm-mini-xp04'], - 'builddir': "win32-branch", - 'factory': win32_branch_steps, - 'category': "Firefox BRANCH_1_8" -} - -win32_branch_fast_builder = { - 'name': "WINNT 5.1 mini talos branch fast", - 'slavenames': ['qm-pxp-fast02'], - 'builddir': "win32-branch-fast", - 'factory': win32_branch_fast_steps, - 'category': "Firefox BRANCH_1_8" -} - win32_moz2_central_builder = { 'name': "WINNT 5.1 talos mozilla-central", 'slavenames': ['qm-pxp-trunk01', 'qm-pxp-trunk02', 'qm-pxp-trunk03'], @@ -974,14 +843,6 @@ vista_moz191_nochrome_builder = { 'category': "Moz191" } -vista_branch_builder = { - 'name': "WINNT 6.0 talos branch", - 'slavenames': ['qm-mini-vista04'], - 'builddir': "vista-branch", - 'factory': vista_branch_steps, - 'category': "Firefox BRANCH_1_8" -} - linux_trunk_builder = { 'name': "Linux talos trunk", 'slavenames': ['qm-mini-ubuntu01', 'qm-mini-ubuntu02', 'qm-mini-ubuntu05'], @@ -1006,22 +867,6 @@ linux_trunk_fast_builder = { 'category': "Firefox Trunk" } -linux_branch_builder = { - 'name': "Linux talos branch", - 'slavenames': ['qm-mini-ubuntu04'], - 'builddir': "linux-branch", - 'factory': linux_branch_steps, - 'category': "Firefox BRANCH_1_8" -} - -linux_branch_fast_builder = { - 'name': "Linux talos branch fast", - 'slavenames': ['qm-plinux-fast02'], - 'builddir': "linux-branch-fast", - 'factory': linux_branch_fast_steps, - 'category': "Firefox BRANCH_1_8" -} - linux_moz2_central_builder = { 'name': "Linux talos mozilla-central", 'slavenames': ['qm-plinux-trunk01', 'qm-plinux-trunk02', 'qm-plinux-trunk03'], @@ -1134,22 +979,6 @@ leopard_moz191_nochrome_builder = { 'category': "Moz191" } -mac_branch_builder = { - 'name': "MacOSX Darwin 8.8.1 talos branch", - 'slavenames': ['qm-pmac04'], - 'builddir': "mac-branch", - 'factory': mac_branch_steps, - 'category': "Firefox BRANCH_1_8" -} - -mac_branch_fast_builder = { - 'name': "MacOSX Darwin 8.8.1 talos branch fast", - 'slavenames': ['qm-pmac-fast02'], - 'builddir': "mac-branch-fast", - 'factory': mac_branch_fast_steps, - 'category': "Firefox BRANCH_1_8" -} - mac_moz2_central_builder = { 'name': "MacOSX Darwin 8.8.1 talos mozilla-central", 'slavenames': ['qm-pmac-trunk01', 'qm-pmac-trunk02', 'qm-pmac-trunk03'], @@ -1204,22 +1033,15 @@ c['builders'].append(win32_trunk_builder) c['builders'].append(win32_trunk_nochrome_builder) c['builders'].append(win32_trunk_fast_builder) c['builders'].append(win32_trunk_jss_builder) -c['builders'].append(win32_branch_builder) -c['builders'].append(win32_branch_fast_builder) c['builders'].append(vista_trunk_builder) c['builders'].append(vista_trunk_nochrome_builder) -c['builders'].append(vista_branch_builder) c['builders'].append(linux_trunk_builder) c['builders'].append(linux_trunk_nochrome_builder) c['builders'].append(linux_trunk_fast_builder) -c['builders'].append(linux_branch_builder) -c['builders'].append(linux_branch_fast_builder) c['builders'].append(mac_trunk_builder) c['builders'].append(mac_trunk_nochrome_builder) c['builders'].append(mac_trunk_fast_builder) c['builders'].append(leopard_trunk_builder) -c['builders'].append(mac_branch_builder) -c['builders'].append(mac_branch_fast_builder) #moz2 c['builders'].append(win32_moz2_central_builder) c['builders'].append(linux_moz2_central_builder)