From 72f840d517b914861ce7fd3c89fa84bd109afd4b Mon Sep 17 00:00:00 2001 From: "bhearsum%mozilla.com" Date: Thu, 11 Oct 2007 19:42:22 +0000 Subject: [PATCH] bug 399385: bring up os x talos slaves running the pageloader on 1.8 and 1.9. r=robcee, patch=me --- .../testing/talos/perfmaster/master.cfg | 145 +++++++++++++++++- 1 file changed, 137 insertions(+), 8 deletions(-) diff --git a/tools/buildbot-configs/testing/talos/perfmaster/master.cfg b/tools/buildbot-configs/testing/talos/perfmaster/master.cfg index c883c209ed0..c2e5fc72c79 100644 --- a/tools/buildbot-configs/testing/talos/perfmaster/master.cfg +++ b/tools/buildbot-configs/testing/talos/perfmaster/master.cfg @@ -132,7 +132,8 @@ c['status'].append(tinderbox.TinderboxMailNotifier( "Linux talos qm-mini-ubuntu01 branch", "MacOSX Darwin 8.8.1 talos qm-pmac01 trunk", "MacOSX Darwin 8.8.1 talos qm-pmac02 branch", - "MacOSX Darwin 8.8.1 talos qm-pmac03 branch"], + "MacOSX Darwin 8.8.1 talos qm-pmac03 trunk", + "MacOSX Darwin 8.8.1 talos qm-pmac04 branch"], logCompression="bzip2")) @@ -234,13 +235,14 @@ c['schedulers'].append(Scheduler(name="branch perfrun linux scheduler", c['schedulers'].append(Scheduler(name="head perfrun scheduler mac", branch="HEAD-MAC", treeStableTimer=5*60, - builderNames=["MacOSX Darwin 8.8.1 talos qm-pmac01 trunk"] + builderNames=["MacOSX Darwin 8.8.1 talos qm-pmac01 trunk", + "MacOSX Darwin 8.8.1 talos qm-pmac03 trunk"] )) c['schedulers'].append(Scheduler(name="branch perfrun scheduler mac", branch="BRANCH-MAC", treeStableTimer=5*60, builderNames=["MacOSX Darwin 8.8.1 talos qm-pmac02 branch", - "MacOSX Darwin 8.8.1 talos qm-pmac03 branch"] + "MacOSX Darwin 8.8.1 talos qm-pmac04 branch"] )) # the 'builders' list defines the Builders. Each one is configured with a @@ -808,6 +810,124 @@ mac_branch_steps.addStep(MozillaRunPerfTests, haltOnFailure=True, env=MozillaEnvironments['mac']) +mac_trunk_pageloader_steps = factory.BuildFactory() +mac_trunk_pageloader_steps.addStep(MozillaChangePusher) +mac_trunk_pageloader_steps.addStep(ShellCommand, + workdir=".", + description="Cleanup", + command="rm -vrf *", + env=MozillaEnvironments['mac']) +mac_trunk_pageloader_steps.addStep(ShellCommand, + command=["cvs", "-d", CVSROOT, "co", "-d", "talos", + "mozilla/testing/performance/talos"], + workdir=".", + description="checking out talos", + haltOnFailure=True, + flunkOnFailure=True, + env=MozillaEnvironments['mac']) +mac_trunk_pageloader_steps.addStep(FileDownload, + mastersrc="scripts/generate-tpcomponent.py", + slavedest="generate-tpcomponent.py", + workdir="talos/page_load_test") +mac_trunk_pageloader_steps.addStep(FileDownload, + mastersrc="scripts/installdmg.sh", + slavedest="installdmg.sh", + workdir=".") +mac_trunk_pageloader_steps.addStep(FileDownload, + mastersrc="configs/sample.config.pageloader", + slavedest="sample.config", + workdir="talos/") +mac_trunk_pageloader_steps.addStep(ShellCommand, + command=["python", "generate-tpcomponent.py"], + workdir="talos/page_load_test", + description="setting up pageloader", + haltOnFailure=True, + flunkOnFailure=True, + env=MozillaEnvironments['mac']) +mac_trunk_pageloader_steps.addStep(MozillaWgetLatest, + workdir=".", + branch="MAC-PL", + url=MAC_TRUNK_BUILDDIR, + filenameSearchString="en-US.mac.dmg", + env=MozillaEnvironments['mac']) +mac_trunk_pageloader_steps.addStep(MozillaInstallDmg, + workdir=".", + branch="MAC-PL", + haltOnFailure=True, + env=MozillaEnvironments['mac']) +mac_trunk_pageloader_steps.addStep(MozillaUpdateConfig, + workdir="talos/", + branch="1.9", + haltOnFailure=True, + executablePath="../Minefield.app/Contents/MacOS/firefox", + configPath=".", + env=MozillaEnvironments['mac']) +mac_trunk_pageloader_steps.addStep(MozillaRunPerfTests, + workdir="talos/", + branch="MAC-PL", + timeout=11000, + haltOnFailure=True, + env=MozillaEnvironments['mac']) + +mac_branch_pageloader_steps = factory.BuildFactory() +mac_branch_pageloader_steps.addStep(MozillaChangePusher) +mac_branch_pageloader_steps.addStep(ShellCommand, + workdir=".", + description="Cleanup", + command="rm -vrf * ../talos-checkout/*", + env=MozillaEnvironments['mac']) +mac_branch_pageloader_steps.addStep(ShellCommand, + command=["cvs", "-d", CVSROOT, "co", "-d", "talos", + "mozilla/testing/performance/talos"], + workdir=".", + description="checking out talos", + haltOnFailure=True, + flunkOnFailure=True, + env=MozillaEnvironments['mac']) +mac_branch_pageloader_steps.addStep(FileDownload, + mastersrc="scripts/generate-tpcomponent.py", + slavedest="generate-tpcomponent.py", + workdir="talos/page_load_test") +mac_branch_pageloader_steps.addStep(FileDownload, + mastersrc="scripts/installdmg.sh", + slavedest="installdmg.sh", + workdir=".") +mac_branch_pageloader_steps.addStep(FileDownload, + mastersrc="configs/sample.config.pageloader.nogfx", + slavedest="sample.config", + workdir="talos/") +mac_branch_pageloader_steps.addStep(ShellCommand, + command=["python", "generate-tpcomponent.py"], + workdir="talos/page_load_test", + description="setting up pageloader", + haltOnFailure=True, + flunkOnFailure=True, + env=MozillaEnvironments['mac']) +mac_branch_pageloader_steps.addStep(MozillaWgetLatest, + workdir=".", + branch="MAC-BRANCH", + url=MAC_BRANCH_BUILDDIR, + filenameSearchString="en-US.mac.dmg", + env=MozillaEnvironments['mac']) +mac_branch_pageloader_steps.addStep(MozillaInstallDmg, + workdir=".", + branch="MAC-BRANCH", + haltOnFailure=True, + env=MozillaEnvironments['mac']) +mac_branch_pageloader_steps.addStep(MozillaUpdateConfig, + workdir="talos/", + branch="1.8", + haltOnFailure=True, + executablePath="../BonEcho.app/Contents/MacOS/firefox", + configPath=".", + env=MozillaEnvironments['mac']) +mac_branch_pageloader_steps.addStep(MozillaRunPerfTests, + workdir="talos/", + branch="MAC-BRANCH", + timeout=11000, + haltOnFailure=True, + env=MozillaEnvironments['mac']) + firefox_branch_winxp_perf_builder = { 'name': "WINNT 5.1 talos branch", @@ -905,11 +1025,19 @@ mac_branch_builder = { 'category': "Firefox BRANCH_1_8" } -mac_branch_builder2 = { - 'name': "MacOSX Darwin 8.8.1 talos qm-pmac03 branch", +mac_trunk_pageloader_builder = { + 'name': "MacOSX Darwin 8.8.1 talos qm-pmac03 trunk", 'slavenames': ['qm-pmac03'], - 'builddir': "mac-branch2", - 'factory': mac_branch_steps, + 'builddir': "mac-trunk-pageloader", + 'factory': mac_trunk_pageloader_steps, + 'category': "Firefox Trunk" +} + +mac_branch_pageloader_builder = { + 'name': "MacOSX Darwin 8.8.1 talos qm-pmac04 branch", + 'slavenames': ['qm-pmac04'], + 'builddir': "mac-branch-pageloader", + 'factory': mac_branch_pageloader_steps, 'category': "Firefox BRANCH_1_8" } @@ -927,4 +1055,5 @@ c['builders'].append(win32_branch_new_pageloader_builder) c['builders'].append(win32_throttled_branch_builder) c['builders'].append(mac_trunk_builder) c['builders'].append(mac_branch_builder) -c['builders'].append(mac_branch_builder2) +c['builders'].append(mac_trunk_pageloader_builder) +c['builders'].append(mac_branch_pageloader_builder)