[zorg] r306787 - Moved builders clang-with-lto-ubuntu, clang-with-thin-lto-ubuntu, llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast to Ubuntu 14.04 slave.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Thu Jun 29 22:33:09 2017
New Revision: 306787

URL: http://llvm.org/viewvc/llvm-project?rev=306787&view=rev
Log:
Moved builders clang-with-lto-ubuntu, clang-with-thin-lto-ubuntu, llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast to Ubuntu 14.04 slave.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=306787&r1=306786&r2=306787&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Jun 29 22:33:09 2017
@@ -118,7 +118,7 @@ def _get_clang_fast_builders():
 
         {'name': "llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast",
          'mergeRequests': False,
-         'slavenames': ["ps4-buildslave1"],
+         'slavenames': ["ps4-buildslave1a"],
          'builddir': "llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast",
          'factory': ClangAndLLDBuilder.getClangAndLLDBuildFactory(
                      extraCmakeOptions=["-DCMAKE_C_COMPILER=clang",
@@ -851,13 +851,13 @@ def _get_lld_builders():
          'category'   : 'lld'},
 
         {'name' : "clang-with-lto-ubuntu",
-         'slavenames' : ["ps4-buildslave1"],
+         'slavenames' : ["ps4-buildslave1a"],
          'builddir' : "clang-with-lto-ubuntu",
          'factory': ClangLTOBuilder.getClangWithLTOBuildFactory(jobs=32),
          'category'   : 'lld'},
 
         {'name' : "clang-with-thin-lto-ubuntu",
-         'slavenames' : ["ps4-buildslave1"],
+         'slavenames' : ["ps4-buildslave1a"],
          'builddir' : "clang-with-thin-lto-ubuntu",
          'factory': ClangLTOBuilder.getClangWithLTOBuildFactory(jobs=16, lto='thin'),
          'category'   : 'lld'},

Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=306787&r1=306786&r2=306787&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Thu Jun 29 22:33:09 2017
@@ -179,8 +179,9 @@ def get_build_slaves():
         # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU L5520 @ 2.27GHz
         create_slave("bpf-build-slave01", properties={'jobs': 16}, max_builds=1),
 
-        # Ubuntu 16.04 x86_64-scei-ps4, 2 x Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz
+        # Ubuntu 14.04 x86_64-scei-ps4, 2 x Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz
         create_slave("ps4-buildslave1", properties={'jobs': 64}, max_builds=2),
+        create_slave("ps4-buildslave1a", properties={'jobs': 64}, max_builds=3),
 
         # Windows 10 Pro x86_64-scei-ps4, 2 x Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz
         create_slave("ps4-buildslave2", properties={'jobs': 72}, max_builds=1),