Bug 585089: add the ability to override the buildbot timeout for a step. This is needed to bring the solaris deep slave online as there are deep phase tests that take over 1300 seconds to run on our old sparc hardware (r+cpeyer)
authorBrent Baker <brbaker@adobe.com>
Mon, 09 Aug 2010 08:12:01 -0400
changeset 4987 293346e6b248243dec022e1e23eb2357fa1e6c8b
parent 4986 9d2ffdc995f1da446e2e6fe57ff4f84b75468401
child 4988 baaadad20418d129449255fc2aaea307e80fff67
push id2662
push userbrbaker@adobe.com
push dateMon, 09 Aug 2010 12:12:15 +0000
bugs585089
Bug 585089: add the ability to override the buildbot timeout for a step. This is needed to bring the solaris deep slave online as there are deep phase tests that take over 1300 seconds to run on our old sparc hardware (r+cpeyer)
build/buildbot/master/commonsteps.py
build/buildbot/master/tamarinredux.py
--- a/build/buildbot/master/commonsteps.py
+++ b/build/buildbot/master/commonsteps.py
@@ -89,25 +89,26 @@ def compile_generic(name, shellname, arg
             env={'branch': WithProperties('%s','branch'), 'silent':WithProperties('%s','silent')},
             description='starting %s build...' % name,
             descriptionDone='finished %s build' % name,
             name="Build_%s" % name,
             workdir="../repo/build/buildbot/slaves/scripts"
             )
 
 
-def test_generic(name, shellname, vmargs, config, scriptargs):
+def test_generic(name, shellname, vmargs, config, scriptargs, timeout=1200):
     # factory.addStep(test_generic("Release", "avmshell", "", "", ""))
     return TestSuiteShellCommand(
             command=['../all/run-acceptance-generic.sh', WithProperties('%s','revision'), '%s' % shellname, '%s' % vmargs, '%s' % config, '%s' % scriptargs],
             env={'branch': WithProperties('%s','branch'), 'silent':WithProperties('%s','silent')},
             description='starting to run %s vmtests...' % name,
             descriptionDone='finished %s vmtests' % name,
             name="Testsuite_%s" % name,
-            workdir="../repo/build/buildbot/slaves/scripts"
+            workdir="../repo/build/buildbot/slaves/scripts",
+            timeout="%s" % timeout
             )
     
 
 def test_generic_ssh(name, shellname, vmargs, config, scriptargs):
     # factory.addStep(test_generic_ssh("Release", "avmshell", "", "", ""))
     return TestSuiteShellCommand(
             command=['../all/run-acceptance-generic-ssh.sh', WithProperties('%s','revision'), '%s' % shellname, '%s' % vmargs, '%s' % config, '%s' % scriptargs],
             env={'branch': WithProperties('%s','branch'), 'silent':WithProperties('%s','silent')},
--- a/build/buildbot/master/tamarinredux.py
+++ b/build/buildbot/master/tamarinredux.py
@@ -1790,17 +1790,17 @@ class tamarinredux:
     windows_deep_factory.addStep(deep_codecoverage)
     windows_deep_factory.addStep(test_misc)
     windows_deep_factory.addStep(test_selftest(name="Debug", shellname="avmshell_d"))
     windows_deep_factory.addStep(test_selftest(name="ReleaseDebugger", shellname="avmshell_s"))
     windows_deep_factory.addStep(test_selftest(name="DebugDebugger", shellname="avmshell_sd"))
     windows_deep_factory.addStep(compile_generic(name="ReleaseDebugger-air", shellname="avmshell_air", args="--enable-shell --enable-override-global-new --enable-use-system-malloc --enable-debugger", upload="true"))
     windows_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air", vmargs="", config="", scriptargs=""))
     windows_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
-    windows_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
+    windows_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyAll", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     windows_deep_factory.addStep(util_process_clean)
     windows_deep_factory.addStep(util_clean_buildsdir)
 
     windows_deep_builder = {
                 'name': "windows-deep",
                 'slavename': "windows-deep",
                 'factory': windows_deep_factory,
                 'builddir': './windows-deep',
@@ -1823,19 +1823,19 @@ class tamarinredux:
     mac_deep_factory.addStep(test_selftest(name="ReleaseDebugger64", shellname="avmshell_s_64"))
     mac_deep_factory.addStep(test_selftest(name="DebugDebugger", shellname="avmshell_sd"))
     mac_deep_factory.addStep(test_selftest(name="DebugDebugger", shellname="avmshell_sd_64"))
     mac_deep_factory.addStep(compile_generic(name="ReleaseDebugger-air", shellname="avmshell_air", args="--enable-shell --enable-override-global-new --enable-use-system-malloc --enable-debugger", upload="true"))
     mac_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air", vmargs="", config="", scriptargs=""))
     mac_deep_factory.addStep(compile_generic(name="ReleaseDebugger64-air", shellname="avmshell_air_64", args="--enable-shell --target=x86_64-darwin --enable-override-global-new --enable-use-system-malloc --enable-debugger", upload="true"))
     mac_deep_factory.addStep(test_generic(name="ReleaseDebugger64-air", shellname="avmshell_air_64", vmargs="", config="", scriptargs=""))
     mac_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
-    mac_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
+    mac_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyAll", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     mac_deep_factory.addStep(test_generic(name="Release64-Dgreedy", shellname="avmshell_64", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
-    mac_deep_factory.addStep(test_generic(name="Release64_Verify", shellname="avmshell_sd_64", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
+    mac_deep_factory.addStep(test_generic(name="DebugDebugger64_VerifyAll", shellname="avmshell_sd_64", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     mac_deep_factory.addStep(TestSuiteShellCommand(
                      command=['./run-brightspot.sh', WithProperties('%s','revision')],
                      env={'branch': WithProperties('%s','branch'), 'silent':WithProperties('%s','silent')},
                      description='running brightspot tests...',
                      descriptionDone='finished running brightspot tests.',
                      name="RunBrightspot",
                      workdir="../repo/build/buildbot/slaves/scripts",
                      timeout=3600)
@@ -1934,17 +1934,17 @@ class tamarinredux:
     mac_ppc_deep_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_ppc", vmargs="", config="ppc-mac-tvm-debugdebugger-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="Debug64", shellname="avmshell_d_64_ppc", vmargs="", config="ppc-mac-tvm-debug-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="DebugDebugger64", shellname="avmshell_sd_64_ppc", vmargs="", config="ppc-mac-tvm-debugdebugger-deep", scriptargs=""))
     mac_ppc_deep_factory.addStep(deep_release_esc)
     mac_ppc_deep_factory.addStep(test_misc)
     mac_ppc_deep_factory.addStep(compile_generic(name="ReleaseDebugger-air", shellname="avmshell_air_ppc", args="--enable-shell --enable-override-global-new --enable-use-system-malloc --enable-debugger --mac-sdk=104u", upload="true"))
     mac_ppc_deep_factory.addStep(test_generic(name="ReleasDebugger-air", shellname="avmshell_air_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell_ppc", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
-    mac_ppc_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd_ppc", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
+    mac_ppc_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyAll", shellname="avmshell_sd_ppc", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     mac_ppc_deep_factory.addStep(util_process_clean)
     mac_ppc_deep_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_deep_builder = {
                 'name': "mac-ppc-deep",
                 'slavename': "mac-ppc-deep",
                 'factory': mac_ppc_deep_factory,
                 'builddir': './mac-ppc-deep',
@@ -1957,22 +1957,22 @@ class tamarinredux:
     solaris_sparc_deep_factory.addStep(sync_clean)
     solaris_sparc_deep_factory.addStep(sync_clone(url=HG_URL))
     solaris_sparc_deep_factory.addStep(sync_update)
     solaris_sparc_deep_factory.addStep(bb_slaveupdate(slave="solaris-sparc-deep"))
     solaris_sparc_deep_factory.addStep(download_testmedia)
     solaris_sparc_deep_factory.addStep(test_selftest(name="Debug", shellname="avmshell_d"))
     solaris_sparc_deep_factory.addStep(test_selftest(name="ReleaseDebugger", shellname="avmshell_s"))
     solaris_sparc_deep_factory.addStep(test_selftest(name="DebugDebugger", shellname="avmshell_sd"))
-    solaris_sparc_deep_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="sparc-sol-tvm-debug-deep", scriptargs=""))
-    solaris_sparc_deep_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="sparc-sol-tvm-debugdebugger-deep", scriptargs=""))
-    #solaris_deep_factory.addStep(deep_release_esc)
+    solaris_sparc_deep_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="sparc-sol-tvm-debug-deep", scriptargs="--showtimes", timeout="2400"))
+    solaris_sparc_deep_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="sparc-sol-tvm-debugdebugger-deep", scriptargs="--showtimes", timeout="2400"))
+    solaris_sparc_deep_factory.addStep(deep_release_esc)
     solaris_sparc_deep_factory.addStep(test_misc)
     solaris_sparc_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
-    solaris_sparc_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
+    solaris_sparc_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyAll", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     solaris_sparc_deep_factory.addStep(util_process_clean)
     solaris_sparc_deep_factory.addStep(util_clean_buildsdir)
 
     solaris_sparc_deep_builder = {
                 'name': "solaris-sparc-deep",
                 'slavename': "solaris-sparc-deep",
                 'factory': solaris_sparc_deep_factory,
                 'builddir': './solaris-sparc-deep',
@@ -2003,17 +2003,17 @@ class tamarinredux:
                 description='starting to run 32-64 differential vmtests...',
                 descriptionDone='finished 32-64 differential vmtests.',
                 name="Testsuite_Differential3264",
                 workdir="../repo/build/buildbot/slaves/scripts"
                 )
     )
     windows_64_deep_factory.addStep(test_misc)
     windows_64_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell_64", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
-    windows_64_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd_64", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
+    windows_64_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyAll", shellname="avmshell_sd_64", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     windows_64_deep_factory.addStep(util_process_clean)
     windows_64_deep_factory.addStep(util_clean_buildsdir)
 
     windows_64_deep_builder = {
                 'name': "windows64-deep",
                 'slavename': "windows64-deep",
                 'factory': windows_64_deep_factory,
                 'builddir': './windows64-deep',
@@ -2061,17 +2061,17 @@ class tamarinredux:
     linux_deep_factory.addStep(test_generic(name="Release-nojit", shellname="avmshell_nojit", vmargs="", config="x86-lnx-tvm-release-nojit", scriptargs=""))
     linux_deep_factory.addStep(compile_generic(name="Release-system-malloc", shellname="avmshell_sysmalloc", args="--enable-shell --enable-use-system-malloc", upload="true"))
     linux_deep_factory.addStep(test_generic(name="Release-system-malloc", shellname="avmshell_sysmalloc", vmargs="", config="x86-lnx-tvm-release-use-system-malloc", scriptargs=""))
     linux_deep_factory.addStep(test_misc)
     linux_deep_factory.addStep(deep_codecoverage)
     linux_deep_factory.addStep(compile_generic(name="ReleaseDebugger-air", shellname="avmshell_air", args="--enable-shell --enable-override-global-new --enable-use-system-malloc --enable-debugger", upload="true"))
     linux_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air", vmargs="", config="", scriptargs=""))
     linux_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
-    linux_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
+    linux_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyAll", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     linux_deep_factory.addStep(util_process_clean)
     linux_deep_factory.addStep(util_clean_buildsdir)
 
     linux_deep_builder = {
                 'name': "linux-deep",
                 'slavename': "linux-deep",
                 'factory': linux_deep_factory,
                 'builddir': './linux-deep',