[zorg] r209934 - llvmlab: Move the LTO build to phase 4 and libc++ tests to phase 3

[Justin Bogner]

Author: bogner
Date: Fri May 30 18:45:39 2014
New Revision: 209934

URL: http://llvm.org/viewvc/llvm-project?rev=209934&view=rev
Log:
llvmlab: Move the LTO build to phase 4 and libc++ tests to phase 3

The LTO build takes a very long time and is holding up phase 3
significantly, whereas the libc++ tests are very fast and aren't
running nearly often enough. This shuffles things around to try to
improve these problems a bit.

Modified:
    zorg/trunk/buildbot/llvmlab/master/config/phase_config.py

Modified: zorg/trunk/buildbot/llvmlab/master/config/phase_config.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/llvmlab/master/config/phase_config.py?rev=209934&r1=209933&r2=209934&view=diff
==============================================================================
--- zorg/trunk/buildbot/llvmlab/master/config/phase_config.py (original)
+++ zorg/trunk/buildbot/llvmlab/master/config/phase_config.py Fri May 30 18:45:39 2014
@@ -73,18 +73,17 @@ The second phase is targeted to run on m
 # Phase 3
 
 phase3_slaves = ['xserve2','xserve4']
-phase3_slaves_lto = ['xserve3']
 phase3_builders = []
 
+# Run the libc++ tests.
+phase3_builders.append(test('libcxx_clang-x86_64-darwin11-RA', phase3_slaves))
+
 # Add an i386 build.
 phase3_builders.append(build('clang-i386-darwin11-RA', phase3_slaves))
 
 # Add a release (no asserts) build.
 phase3_builders.append(build('clang-x86_64-darwin11-R', phase3_slaves))
 
-# Add an lto release build.
-phase3_builders.append(build('clang-x86_64-darwin11-Rlto', phase3_slaves_lto))
-
 phases.append(
     { 'number' : 3,
       'name' : 'tree health',
@@ -102,10 +101,11 @@ The third phase is targeted to react wit
 
 # Phase 4
 
-phase4_slaves = ['xserve4']
+phase4_slaves = ['xserve3']
 phase4_builders = []
 
-phase4_builders.append(test('libcxx_clang-x86_64-darwin11-RA', phase4_slaves))
+# Add an lto release build.
+phase4_builders.append(build('clang-x86_64-darwin11-Rlto', phase4_slaves))
 
 phases.append(
     { 'number' : 4,