[pypy-commit] buildbot default: Halt build on failures in requred steps. Remove distclean.

[csenger]

Author: Carsten Senger <senger at rehfisch.de>
Branch: 
Changeset: r627:a9d31fb4d25c
Date: 2012-01-21 22:48 +0100
http://bitbucket.org/pypy/buildbot/changeset/a9d31fb4d25c/

Log:	Halt build on failures in requred steps. Remove distclean.

	* Halt the build on errors in configure, make or the benchmark
	runner.
	* Add the `make buildbottest` step again and mark the build as having
	warnings if it fails.
	* Remove distclean so we can inspect the build when problems occure.

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -404,7 +404,8 @@
         self.addStep(ShellCmd(
             description="configure cpython",
             command=["./configure"],
-            timeout=300))
+            timeout=300,
+            haltOnFailure=True))
 
         self.addStep(ShellCmd(
             description="cleanup cpython",
@@ -414,14 +415,16 @@
         self.addStep(ShellCmd(
             description="make cpython",
             command=["make"],
+            timeout=600,
+            haltOnFailure=True))
+
+        self.addStep(ShellCmd(
+            description="test cpython",
+            command=["make", "buildbottest"],
+            haltOnFailure=False,
+            warnOnFailure=True,
             timeout=600))
 
-        # self.addStep(ShellCmd(
-        #     description="test cpython",
-        #     command=["make", "buildbottest"],
-        #     haltOnFailure=False,
-        #     timeout=600))
-
         cpython_interpreter = '../build/python'
         self.addStep(ShellCmd(
             # this step needs exclusive access to the CPU
@@ -434,6 +437,7 @@
                      '--baseline', cpython_interpreter,
                      ],
             workdir='./benchmarks',
+            haltOnFailure=True,
             timeout=3600))
 
         # a bit obscure hack to get both os.path.expand and a property
@@ -442,8 +446,3 @@
         self.addStep(transfer.FileUpload(slavesrc="benchmarks/result.json",
                                          masterdest=WithProperties(resultfile),
                                          workdir="."))
-
-        self.addStep(ShellCmd(
-            description="distcleanup cpython",
-            command=["make", "distclean"],
-            timeout=300))