From 5c17c74bb76eb169f42cfcc6c6154b4e93e8d8d9 Mon Sep 17 00:00:00 2001 From: "anodelman%mozilla.com" Date: Wed, 6 Feb 2008 20:23:54 +0000 Subject: [PATCH] Bug 414456 - set up qm-pmac-fast01, qm-plinux-fast01, qm-pxp-fast01 Initial creation and staging, a=anodelman r=rcampbell git-svn-id: svn://10.0.0.236/trunk@245030 18797224-902f-48f8-a5cc-f745e15eee43 --- .../perfmaster/configs/fast.sample.config | 127 ++++++++++ .../perfmaster/configs/historic_manifest.txt | 41 ++++ .../testing/talos/perfmaster/master.cfg | 231 +++++++++++++++++- 3 files changed, 396 insertions(+), 3 deletions(-) create mode 100644 mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/fast.sample.config create mode 100644 mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/historic_manifest.txt diff --git a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/fast.sample.config b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/fast.sample.config new file mode 100644 index 00000000000..ad3c0bf64bb --- /dev/null +++ b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/fast.sample.config @@ -0,0 +1,127 @@ +# Sample Talos configuration file + +# The title of the report +title: firefox_testing + +#csv_file: 'out.csv' +results_server: 'graphs-stage.mozilla.org' +results_link: '/bulk.cgi' + +# Path to Firefox to test +firefox: firefox/firefox + +branch: testbranch + +buildid: testbuildid + +profile_path: base_profile + +init_url: getInfo.html + +# Preferences to set in the test (use "preferences : {}" for no prefs) +preferences : + browser.shell.checkDefaultBrowser : false + browser.warnOnQuit : false + browser.link.open_newwindow : 2 + dom.allow_scripts_to_close_windows : true + dom.disable_open_during_load: false + dom.max_script_run_time : 0 + browser.dom.window.dump.enabled: true + network.proxy.type : 1 + network.proxy.http : localhost + network.proxy.http_port : 80 + network.proxy.share_proxy_settings : true + dom.disable_window_flip : true + dom.disable_window_move_resize : true + security.enable_java : false + extensions.checkCompatibility : false + extensions.update.notifyUser: false + +# Extensions to install in test (use "extensions: {}" for none) +# Need quotes around guid because of curly braces +# extensions : +# "{12345678-1234-1234-1234-abcd12345678}" : c:\path\to\unzipped\xpi +# foo@sample.com : c:\path\to\other\unzipped\xpi +extensions : {} + +#any directories whose contents need to be installed in the browser before running the tests +# this assumes that the directories themselves already exist in the firefox path +dirs: + chrome : page_load_test/chrome + components : page_load_test/components + +# Environment variables to set during test (use env: {} for none) +env : + NO_EM_RESTART : 1 +# Tests to run +# url : (REQUIRED) url to load into the given firefox browser +# url_mod : (OPTIONAL) a bit of code to be evaled and added to the given url during each cycle of the test +# resolution: (REQUIRED) how long (in seconds) to pause between counter sampling +# cycles : (REQUIRED) how many times to run the test +# counters : (REQUIRED) types of system activity to monitor during test run, an be empty +# For possible values of counters argument on Windows, see +# http://technet2.microsoft.com/WindowsServer/en/Library/86b5d116-6fb3-427b-af8c-9077162125fe1033.mspx?mfr=true +# Possible values on Linux and Mac: +# counters : ['Private Bytes', 'RSS'] +# Standard windows values: +# counters : ['Working Set', 'Private Bytes', '% Processor Time'] + +# to set up a new test it must have the correct configuration options and drop information in a standard format +# the format is seen in the regular expressions in ttest.py +# to see how the data passed from the browser is processed see send_to_graph an send_to_csv in run_tests.py +tests : + ts : + url : startup_test/startup_test.html?begin= + url_mod : str(int(time.time()*1000)) + resolution : 1 + cycles : 20 + win_counters : [] + unix_counters : [] + tp: + url : '-tp page_load_test/manifest.txt -tpchrome -tpformat tinderbox -tpcycles 10 -tptimeout 120000' + resolution : 1 + cycles : 1 + win_counters : ['Working Set', 'Private Bytes', '% Processor Time'] + unix_counters : ['RSS', 'Private Bytes'] +# tp_js: +# url : '"http://localhost/page_load_test/framecycler.html?quit=1&cycles=5"' +# resolution : 1 +# cycles : 1 +# win_counters : ['Working Set', 'Private Bytes', '% Processor Time'] +# unix_counters: ['RSS', 'Private Bytes'] + tdhtml: + url: '-tp page_load_test/dhtml/dhtml.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tptimeout 120000' + resolution : 1 + cycles : 1 + win_counters : [] + unix_counters : [] +# tgfx: +# url: '-tp page_load_test/gfx/gfx.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tprender -tptimeout 300000' +# resolution : 1 +# cycles : 1 +# win_counters : [] +# unix_counters : [] +# tsvg: +# url: '-tp page_load_test/svg/svg.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tptimeout 120000' +# resolution : 1 +# cycles : 1 +# win_counters : [] +# unix_counters : [] + twinopen: + url: startup_test/twinopen/winopen.xul?phase1=20 + resolution: 1 + cycles: 1 + win_counters: [] + unix_counters: [] +# tjss: +# url: '-tp page_load_test/jss/jss.manifest -tpchrome -tpformat tinderbox -tpcycles 1' +# resolution : 1 +# cycles : 1 +# win_counters : [] +# unix_counters : [] +# tsspider: +# url: '-tp page_load_test/sunspider/sunspider.manifest -tpchrome -tpformat tinderbox -tpcycles 5' +# resolution : 1 +# cycles : 1 +# win_counters : [] +# unix_counters : [] diff --git a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/historic_manifest.txt b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/historic_manifest.txt new file mode 100644 index 00000000000..d2ae01d9203 --- /dev/null +++ b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/historic_manifest.txt @@ -0,0 +1,41 @@ +http://localhost/page_load_test/pages/bugzilla.mozilla.org/index.html +http://localhost/page_load_test/pages/espn.go.com/index.html +http://localhost/page_load_test/pages/home.netscape.com/index.html +http://localhost/page_load_test/pages/hotwired.lycos.com/index.html +http://localhost/page_load_test/pages/lxr.mozilla.org/index.html +http://localhost/page_load_test/pages/my.netscape.com/index.html +http://localhost/page_load_test/pages/news.cnet.com/index.html +http://localhost/page_load_test/pages/slashdot.org/index.html +http://localhost/page_load_test/pages/vanilla-page/index.html +http://localhost/page_load_test/pages/web.icq.com/index.html +http://localhost/page_load_test/pages/www.altavista.com/index.html +http://localhost/page_load_test/pages/www.amazon.com/index.html +http://localhost/page_load_test/pages/www.aol.com/index.html +http://localhost/page_load_test/pages/www.apple.com/index.html +http://localhost/page_load_test/pages/www.cnn.com/index.html +http://localhost/page_load_test/pages/www.compuserve.com/index.html +http://localhost/page_load_test/pages/www.digitalcity.com/index.html +http://localhost/page_load_test/pages/www.ebay.com/index.html +http://localhost/page_load_test/pages/www.excite.com/index.html +http://localhost/page_load_test/pages/www.expedia.com/index.html +http://localhost/page_load_test/pages/www.google.com/index.html +http://localhost/page_load_test/pages/www.iplanet.com/index.html +http://localhost/page_load_test/pages/www.mapquest.com/index.html +http://localhost/page_load_test/pages/www.microsoft.com/index.html +http://localhost/page_load_test/pages/www.moviefone.com/index.html +http://localhost/page_load_test/pages/www.msn.com/index.html +http://localhost/page_load_test/pages/www.msnbc.com/index.html +http://localhost/page_load_test/pages/www.nytimes.com/index.html +http://localhost/page_load_test/pages/www.nytimes.com_Table/index.html +http://localhost/page_load_test/pages/www.quicken.com/index.html +http://localhost/page_load_test/pages/www.spinner.com/index.html +http://localhost/page_load_test/pages/www.sun.com/index.html +http://localhost/page_load_test/pages/www.time.com/index.html +http://localhost/page_load_test/pages/www.tomshardware.com/index.html +http://localhost/page_load_test/pages/www.travelocity.com/index.html +http://localhost/page_load_test/pages/www.voodooextreme.com/index.html +http://localhost/page_load_test/pages/www.w3.org_DOML2Core/index.html +http://localhost/page_load_test/pages/www.wired.com/index.html +http://localhost/page_load_test/pages/www.yahoo.com/index.html +http://localhost/page_load_test/pages/www.zdnet.com/index.html +http://localhost/page_load_test/pages/www.zdnet.com_Gamespot.com/index.html diff --git a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg index 2186261ff8d..c805d402e48 100644 --- a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg +++ b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg @@ -89,7 +89,10 @@ c['bots'] = [("qm-pxp01", "1dontcare"), ("qm-mini-ubuntu02", "l1nux"), ("qm-mini-ubuntu03", "l1nux"), ("qm-mini-ubuntu04", "l1nux"), - ("qm-mini-ubuntu05", "l1nux")] + ("qm-mini-ubuntu05", "l1nux"), + ("qm-pxp-fast01", "w1nd3rs"), + ("qm-plinux-fast01", "l1nux"), + ("qm-pmac-fast01", "mac1nt0sh")] ## ## Status @@ -148,8 +151,11 @@ c['status'].append(tinderbox.TinderboxMailNotifier( "WINNT 5.1 talos branch", "WINNT 6.0 talos trunk nochrome", "WINNT 5.1 mini talos trunk nochrome", + "WINNT 5.1 mini talos trunk fast", "Linux talos trunk nochrome", + "Linux talos trunk fast", "MacOSX Darwin 8.8.1 talos nochrome", + "MacOSX Darwin 8.8.1 talos trunk fast", "MacOSX Darwin 9.0.0 talos trunk"], useChangeTime=True, logCompression="bzip2")) @@ -226,6 +232,7 @@ c['schedulers'].append(Scheduler(name="head perfrun scheduler", "WINNT 5.1 mini talos trunk", "WINNT 6.0 talos trunk", "WINNT 5.1 mini talos trunk nochrome", + "WINNT 5.1 mini talos trunk fast", "WINNT 6.0 talos trunk nochrome"] )) c['schedulers'].append(Scheduler(name="branch perfrun scheduler", @@ -241,7 +248,8 @@ c['schedulers'].append(Scheduler(name="head perfrun linux scheduler", treeStableTimer=5*60, builderNames= ["Linux talos trunk", - "Linux talos trunk nochrome"] + "Linux talos trunk nochrome", + "Linux talos trunk fast"] )) c['schedulers'].append(Scheduler(name="branch perfrun linux scheduler", branch="BRANCH_LINUX", @@ -254,6 +262,7 @@ c['schedulers'].append(Scheduler(name="head perfrun scheduler mac", treeStableTimer=5*60, builderNames=["MacOSX Darwin 8.8.1 talos trunk", "MacOSX Darwin 8.8.1 talos trunk nochrome", + "MacOSX Darwin 8.8.1 talos trunk fast", "MacOSX Darwin 9.0.0 talos trunk"] )) c['schedulers'].append(Scheduler(name="branch perfrun scheduler mac", @@ -495,6 +504,71 @@ win32_trunk_nochrome_steps.addStep(MozillaRunPerfTests, command=['python', 'run_tests.py', '--noisy'], env=MozillaEnvironments['vc8perf']) +win32_trunk_fast_steps = factory.BuildFactory() +win32_trunk_fast_steps.addStep(ShellCommand, + workdir=".", + description="Cleanup", + command=["rm", "-rf", "*.zip", "talos/", "firefox/"], + env=MozillaEnvironments['vc8perf']) +win32_trunk_fast_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_fast_steps.addStep(FileDownload, + mastersrc="scripts/generate-tpcomponent.py", + slavedest="generate-tpcomponent.py", + workdir="talos/page_load_test") +win32_trunk_fast_steps.addStep(FileDownload, + mastersrc="configs/fast.sample.config", + slavedest="sample.config", + workdir="talos/") +win32_trunk_fast_steps.addStep(FileDownload, + mastersrc="configs/historic_manifest.txt", + slavedest="manifest.txt", + workdir="talos/page_load_test") +win32_trunk_fast_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_fast_steps.addStep(MozillaWgetLatest, + workdir=".", + branch="1.9", + url=WIN32_TRUNK_BUILDDIR, + filenameSearchString="en-US.win32.zip", + env=MozillaEnvironments['vc8perf']) +win32_trunk_fast_steps.addStep(MozillaInstallZip, + workdir=".", + branch="1.9", + haltOnFailure=True, + env=MozillaEnvironments['vc8perf']) + # TODO: remove this when msys bug is fixed +win32_trunk_fast_steps.addStep(ShellCommand, + workdir="firefox/", + description="chmod files (see msys bug)", + command=["chmod", "-v", "-R", "a+x", "."], + env=MozillaEnvironments['vc8perf']) +win32_trunk_fast_steps.addStep(MozillaUpdateConfig, + workdir="talos/", + branch="1.9", + haltOnFailure=True, + executablePath="..\\firefox\\firefox.exe", + configPath=".", + env=MozillaEnvironments['vc8perf']) +win32_trunk_fast_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=".", @@ -854,6 +928,67 @@ linux_trunk_nochrome_steps.addStep(MozillaRunPerfTests, command=['python', 'run_tests.py', '--noisy'], env=MozillaEnvironments['linux']) +linux_trunk_fast_steps = factory.BuildFactory() +linux_trunk_fast_steps.addStep(ShellCommand, + workdir=".", + description="Cleanup", + command=["rm", "-rf", "*.bz2", "talos/", "firefox/"], + env=MozillaEnvironments['linux']) +linux_trunk_fast_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['linux']) +linux_trunk_fast_steps.addStep(FileDownload, + mastersrc="scripts/generate-tpcomponent.py", + slavedest="generate-tpcomponent.py", + workdir="talos/page_load_test") +linux_trunk_fast_steps.addStep(FileDownload, + mastersrc="configs/fast.sample.config", + slavedest="sample.config", + workdir="talos/") +linux_trunk_fast_steps.addStep(FileDownload, + mastersrc="configs/historic_manifest.txt", + slavedest="manifest.txt", + workdir="talos/page_load_test") +linux_trunk_fast_steps.addStep(ShellCommand, + command=["python", "generate-tpcomponent.py"], + workdir="talos/page_load_test", + description="setting up pageloader", + haltOnFailure=True, + flunkOnFailure=True, + env=MozillaEnvironments['linux']) +linux_trunk_fast_steps.addStep(MozillaWgetLatest, + workdir=".", + branch="LINUX-PL", + url=LINUX_TRUNK_BUILDDIR, + filenameSearchString="en-US.linux-i686.tar.bz2", + env=MozillaEnvironments['linux']) +linux_trunk_fast_steps.addStep(MozillaInstallTarBz2, + workdir=".", + branch="LINUX-PL", + haltOnFailure=True, + env=MozillaEnvironments['linux']) +linux_trunk_fast_steps.addStep(MozillaUpdateConfig, + workdir="talos/", + branch="1.9", + haltOnFailure=True, + # TODO: when talos supports relative paths on win32 + # make this a relative path + executablePath="../firefox/firefox", + configPath=".", + env=MozillaEnvironments['linux']) +linux_trunk_fast_steps.addStep(MozillaRunPerfTests, + workdir="talos/", + branch="LINUX-PL", + timeout=21600, + haltOnFailure=True, + command=['python', 'run_tests.py', '--noisy'], + env=MozillaEnvironments['linux']) + linux_branch_steps = factory.BuildFactory() linux_branch_steps.addStep(ShellCommand, workdir=".", @@ -1027,6 +1162,69 @@ mac_trunk_nochrome_steps.addStep(MozillaRunPerfTests, command=['python', 'run_tests.py', '--noisy'], env=MozillaEnvironments['mac']) +mac_trunk_fast_steps = factory.BuildFactory() +mac_trunk_fast_steps.addStep(ShellCommand, + workdir=".", + description="Cleanup", + command="rm -vrf *", + env=MozillaEnvironments['mac']) +mac_trunk_fast_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_fast_steps.addStep(FileDownload, + mastersrc="scripts/generate-tpcomponent.py", + slavedest="generate-tpcomponent.py", + workdir="talos/page_load_test") +mac_trunk_fast_steps.addStep(FileDownload, + mastersrc="scripts/installdmg.sh", + slavedest="installdmg.sh", + workdir=".") +mac_trunk_fast_steps.addStep(FileDownload, + mastersrc="configs/fast.sample.config", + slavedest="sample.config", + workdir="talos/") +mac_trunk_fast_steps.addStep(FileDownload, + mastersrc="configs/historic_manifest.txt", + slavedest="manifest.txt", + workdir="talos/page_load_test") +mac_trunk_fast_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_fast_steps.addStep(MozillaWgetLatest, + workdir=".", + branch="MAC-PL", + url=MAC_TRUNK_BUILDDIR, + filenameSearchString="en-US.mac.dmg", + env=MozillaEnvironments['mac']) +mac_trunk_fast_steps.addStep(MozillaInstallDmg, + workdir=".", + branch="MAC-PL", + haltOnFailure=True, + env=MozillaEnvironments['mac']) +mac_trunk_fast_steps.addStep(MozillaUpdateConfig, + workdir="talos/", + branch="1.9", + haltOnFailure=True, + executablePath="../Minefield.app/Contents/MacOS/firefox", + configPath=".", + env=MozillaEnvironments['mac']) +mac_trunk_fast_steps.addStep(MozillaRunPerfTests, + workdir="talos/", + branch="MAC-PL", + timeout=21600, + haltOnFailure=True, + command=['python', 'run_tests.py', '--noisy'], + env=MozillaEnvironments['mac']) + leopard_trunk_stage_steps = factory.BuildFactory() leopard_trunk_stage_steps.addStep(ShellCommand, workdir=".", @@ -1173,11 +1371,19 @@ win32_trunk_builder = { win32_trunk_nochrome_builder = { 'name': "WINNT 5.1 mini talos trunk nochrome", 'slavenames': ['qm-mini-xp05'], - 'builddir': "win32-trunk-mini-nochome", + 'builddir': "win32-trunk-mini-nochrome", 'factory': win32_trunk_nochrome_steps, 'category': "Firefox Trunk" } +win32_trunk_fast_builder = { + 'name': "WINNT 5.1 mini talos trunk fast", + 'slavenames': ['qm-pxp-fast01'], + 'builddir': "win32-trunk-mini-fast", + 'factory': win32_trunk_fast_steps, + 'category': "Firefox Trunk" +} + win32_branch_builder = { 'name': "WINNT 5.1 mini talos branch", 'slavenames': ['qm-mini-xp04'], @@ -1226,6 +1432,14 @@ linux_trunk_nochrome_builder = { 'category': "Firefox Trunk" } +linux_trunk_fast_builder = { + 'name': "Linux talos trunk fast", + 'slavenames': ['qm-plinux-fast01'], + 'builddir': "linux-trunk-fast", + 'factory': linux_trunk_fast_steps, + 'category': "Firefox Trunk" +} + linux_branch_builder = { 'name': "Linux talos branch", 'slavenames': ['qm-mini-ubuntu04'], @@ -1250,6 +1464,14 @@ mac_trunk_nochrome_builder = { 'category': "Firefox Trunk" } +mac_trunk_fast_builder = { + 'name': "MacOSX Darwin 8.8.1 talos trunk fast", + 'slavenames': ['qm-pmac-fast01'], + 'builddir': "mac-trunk-fast", + 'factory': mac_trunk_fast_steps, + 'category': "Firefox Trunk" +} + leopard_trunk_stage_builder = { 'name': "MacOSX Darwin 9.0.0 talos trunk", 'slavenames': ['qm-pmac-trunk04', 'qm-pmac-trunk05', 'qm-pmac-trunk06'], @@ -1272,14 +1494,17 @@ c['builders'].append(firefox_branch_winxp_perf_builder) 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_branch_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(mac_trunk_builder) c['builders'].append(mac_trunk_nochrome_builder) +c['builders'].append(mac_trunk_fast_builder) c['builders'].append(leopard_trunk_stage_builder) c['builders'].append(mac_branch_builder)