From 46c388d487917d3e2044f724d8684502b376c2f5 Mon Sep 17 00:00:00 2001 From: "anodelman%mozilla.com" Date: Thu, 21 Feb 2008 22:13:05 +0000 Subject: [PATCH] Bug 416251 - set up suite of machines for jss testing. add jss machines to stage. a=anodelman, r=ccooper --- .../perfmaster/configs/jss.sample.config | 0 .../testing/talos/perfmaster/master.cfg | 77 ++++++++++++++++++- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 tools/buildbot-configs/testing/talos/perfmaster/configs/jss.sample.config diff --git a/tools/buildbot-configs/testing/talos/perfmaster/configs/jss.sample.config b/tools/buildbot-configs/testing/talos/perfmaster/configs/jss.sample.config new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tools/buildbot-configs/testing/talos/perfmaster/master.cfg b/tools/buildbot-configs/testing/talos/perfmaster/master.cfg index e3bea90f600..91dd361014c 100644 --- a/tools/buildbot-configs/testing/talos/perfmaster/master.cfg +++ b/tools/buildbot-configs/testing/talos/perfmaster/master.cfg @@ -72,6 +72,9 @@ c['bots'] = [("qm-pxp01", "1dontcare"), ("qm-mini-xp06", "w1nd3rs"), ("qm-mini-xp07", "w1nd3rs"), ("qm-mini-xp08", "w1nd3rs"), + ("qm-pxp-jss01", "w1nd3rs"), + ("qm-pxp-jss02", "w1nd3rs"), + ("qm-pxp-jss03", "w1nd3rs"), ("qm-mini-vista01", "vist@"), ("qm-mini-vista02", "vist@"), ("qm-mini-vista03", "vist@"), @@ -161,6 +164,7 @@ c['status'].append(tinderbox.TinderboxMailNotifier( "WINNT 5.1 talos branch", "MacOSX Darwin 9.0.0 talos trunk", "WINNT 5.1 mini talos branch fast", + "WINNT 5.1 mini talos trunk jss", "Linux talos branch fast", "MacOSX Darwin 8.8.1 talos branch fast"], useChangeTime=True, @@ -239,6 +243,7 @@ c['schedulers'].append(Scheduler(name="head perfrun scheduler", "WINNT 6.0 talos trunk", "WINNT 5.1 mini talos trunk nochrome", "WINNT 5.1 mini talos trunk fast", + "WINNT 5.1 mini talos trunk jss", "WINNT 6.0 talos trunk nochrome"] )) c['schedulers'].append(Scheduler(name="branch perfrun scheduler", @@ -277,7 +282,7 @@ 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"]] + "MacOSX Darwin 8.8.1 talos branch fast"] )) # the 'builders' list defines the Builders. Each one is configured with a @@ -578,6 +583,67 @@ win32_trunk_fast_steps.addStep(MozillaRunPerfTests, command=['python', 'run_tests.py', '--noisy'], env=MozillaEnvironments['vc8perf']) +win32_trunk_jss_steps = factory.BuildFactory() +win32_trunk_jss_steps.addStep(ShellCommand, + workdir=".", + description="Cleanup", + command=["rm", "-rf", "*.zip", "talos/", "firefox/"], + env=MozillaEnvironments['vc8perf']) +win32_trunk_jss_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['vc8perf']) +win32_trunk_jss_steps.addStep(FileDownload, + mastersrc="scripts/generate-tpcomponent.py", + slavedest="generate-tpcomponent.py", + workdir="talos/page_load_test") +win32_trunk_jss_steps.addStep(FileDownload, + mastersrc="configs/jss.sample.config", + slavedest="sample.config", + workdir="talos/") +win32_trunk_jss_steps.addStep(ShellCommand, + command=["python", "generate-tpcomponent.py"], + workdir="talos/page_load_test", + description="setting up pageloader", + haltOnFailure=True, + flunkOnFailure=True, + env=MozillaEnvironments['vc8perf']) +win32_trunk_jss_steps.addStep(MozillaWgetLatest, + workdir=".", + branch="1.9", + url=WIN32_TRUNK_BUILDDIR, + filenameSearchString="en-US.win32.zip", + env=MozillaEnvironments['vc8perf']) +win32_trunk_jss_steps.addStep(MozillaInstallZip, + workdir=".", + branch="1.9", + haltOnFailure=True, + env=MozillaEnvironments['vc8perf']) + # TODO: remove this when msys bug is fixed +win32_trunk_jss_steps.addStep(ShellCommand, + workdir="firefox/", + description="chmod files (see msys bug)", + command=["chmod", "-v", "-R", "a+x", "."], + env=MozillaEnvironments['vc8perf']) +win32_trunk_jss_steps.addStep(MozillaUpdateConfig, + workdir="talos/", + branch="1.9", + haltOnFailure=True, + executablePath="..\\firefox\\firefox.exe", + configPath=".", + env=MozillaEnvironments['vc8perf']) +win32_trunk_jss_steps.addStep(MozillaRunPerfTests, + workdir="talos/", + branch="1.9", + timeout=14400, + haltOnFailure=True, + command=['python', 'run_tests.py', '--noisy'], + env=MozillaEnvironments['vc8perf']) + win32_branch_steps = factory.BuildFactory() win32_branch_steps.addStep(ShellCommand, workdir=".", @@ -1576,6 +1642,14 @@ win32_trunk_fast_builder = { 'category': "Firefox Trunk" } +win32_trunk_jss_builder = { + 'name': "WINNT 5.1 mini talos trunk jss", + 'slavenames': ['qm-pxp-jss01', 'qm-pxp-jss02', 'qm-pxp-jss03'], + 'builddir': "win32-trunk-mini-jss", + 'factory': win32_trunk_jss_steps, + 'category': "Firefox Trunk" +} + win32_branch_builder = { 'name': "WINNT 5.1 mini talos branch", 'slavenames': ['qm-mini-xp04'], @@ -1711,6 +1785,7 @@ c['builders'].append(firefox_trunk_winxp_perf_builder) 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)