[zorg] r316272 - [zorg] Combine multiple sanitizer bots on single machine to improve efficiency

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Sat Oct 21 11:50:27 2017
New Revision: 316272

URL: http://llvm.org/viewvc/llvm-project?rev=316272&view=rev
Log:
[zorg] Combine multiple sanitizer bots on single machine to improve efficiency

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=316272&r1=316271&r2=316272&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sat Oct 21 11:50:27 2017
@@ -961,37 +961,33 @@ def _get_llgo_builders():
 def _get_sanitizer_builders():
       return [
           {'name': "sanitizer-x86_64-linux",
-           'slavenames' :["sanitizer-buildbot1"],
+           'slavenames' :["sanitizer-buildbot1", "sanitizer-buildbot2"],
            'builddir': "sanitizer-x86_64-linux",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
+          {'name': "sanitizer-x86_64-linux-fast",
+           'slavenames' :["sanitizer-buildbot1", "sanitizer-buildbot2"],
+           'builddir': "sanitizer-x86_64-linux-fast",
+           'factory': SanitizerBuilder.getSanitizerBuildFactory()},
 
           {'name': "sanitizer-x86_64-linux-bootstrap",
-           'slavenames' :["sanitizer-buildbot2"],
+           'slavenames' :["sanitizer-buildbot3", "sanitizer-buildbot4"],
            'builddir': "sanitizer-x86_64-linux-bootstrap",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
-
-           {'name': "sanitizer-x86_64-linux-bootstrap-msan",
-           'slavenames' :["sanitizer-buildbot7"],
-           'builddir': "sanitizer-x86_64-linux-bootstrap-msan",
-           'factory': SanitizerBuilder.getSanitizerBuildFactory()},
-
-           {'name': "sanitizer-x86_64-linux-bootstrap-ubsan",
-           'slavenames' :["sanitizer-buildbot8"],
+          {'name': "sanitizer-x86_64-linux-bootstrap-ubsan",
+           'slavenames' :["sanitizer-buildbot3", "sanitizer-buildbot4"],
            'builddir': "sanitizer-x86_64-linux-bootstrap-ubsan",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
 
-          {'name': "sanitizer-x86_64-linux-fast",
-           'slavenames' :["sanitizer-buildbot3"],
-           'builddir': "sanitizer-x86_64-linux-fast",
+          {'name': "sanitizer-x86_64-linux-bootstrap-msan",
+           'slavenames' :["sanitizer-buildbot7", "sanitizer-buildbot8"],
+           'builddir': "sanitizer-x86_64-linux-bootstrap-msan",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
-
           {'name': "sanitizer-x86_64-linux-autoconf",
-           'slavenames' :["sanitizer-buildbot4"],
+           'slavenames' :["sanitizer-buildbot7", "sanitizer-buildbot8"],
            'builddir': "sanitizer-x86_64-linux-autoconf",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
-
           {'name': "sanitizer-x86_64-linux-fuzzer",
-           'slavenames' :["sanitizer-buildbot5", "sanitizer-buildbot4"],
+           'slavenames' :["sanitizer-buildbot7", "sanitizer-buildbot8"],
            'builddir': "sanitizer-x86_64-linux-fuzzer",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
 

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=316272&r1=316271&r2=316272&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Sat Oct 21 11:50:27 2017
@@ -127,21 +127,21 @@ def get_build_slaves():
         create_slave("juno-aarch64-01", properties={'jobs': 4}, max_builds=1),
 
         # Debian 7.7 x86_64 GCE instance
-        create_slave("sanitizer-buildbot1", properties={'jobs': 16}, max_builds=1),
+        create_slave("sanitizer-buildbot1", properties={'jobs': 64}, max_builds=2),
         # Debian 7.7 x86_64 GCE instance
-        create_slave("sanitizer-buildbot2", properties={'jobs': 16}, max_builds=1),
+        create_slave("sanitizer-buildbot2", properties={'jobs': 64}, max_builds=2),
         # Debian 7.7 x86_64 GCE instance
-        create_slave("sanitizer-buildbot3", properties={'jobs': 8}, max_builds=1),
+        create_slave("sanitizer-buildbot3", properties={'jobs': 64}, max_builds=2),
         # Debian 7.7 x86_64 GCE instance
-        create_slave("sanitizer-buildbot4", properties={'jobs': 8}, max_builds=2),
+        create_slave("sanitizer-buildbot4", properties={'jobs': 64}, max_builds=2),
         # Debian 7.7 x86_64 GCE instance
-        create_slave("sanitizer-buildbot5", properties={'jobs': 8}, max_builds=1),
+        create_slave("sanitizer-buildbot5", properties={'jobs': 64}, max_builds=2),
         # Ubuntu 14.04 x86_64 6-core z440 workstation
         create_slave("sanitizer-buildbot6", properties={'jobs': 6}, max_builds=1),
         # Debian 7.7 x86_64 GCE instance
-        create_slave("sanitizer-buildbot7", properties={'jobs': 96}, max_builds=1),
+        create_slave("sanitizer-buildbot7", properties={'jobs': 64}, max_builds=3),
         # Debian 7.7 x86_64 GCE instance
-        create_slave("sanitizer-buildbot8", properties={'jobs': 96}, max_builds=1),
+        create_slave("sanitizer-buildbot8", properties={'jobs': 64}, max_builds=3),
 
         # Debian 7.7 x86_64 GCE instance
         create_slave("modules-slave-1", properties={'jobs': 16}, max_builds=1),