[zorg] r315949 - [zorg] Add 2 new sanitizer build bots to split slow sanitizer-x86_64-linux-bootstrap

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Mon Oct 16 15:43:42 2017
New Revision: 315949

URL: http://llvm.org/viewvc/llvm-project?rev=315949&view=rev
Log:
[zorg] Add 2 new sanitizer build bots to split slow sanitizer-x86_64-linux-bootstrap

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.py
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.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=315949&r1=315948&r2=315949&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Oct 16 15:43:42 2017
@@ -970,6 +970,16 @@ def _get_sanitizer_builders():
            '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"],
+           '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",

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=315949&r1=315948&r2=315949&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Mon Oct 16 15:43:42 2017
@@ -138,6 +138,10 @@ def get_build_slaves():
         create_slave("sanitizer-buildbot5", properties={'jobs': 8}, max_builds=1),
         # 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),
+        # Debian 7.7 x86_64 GCE instance
+        create_slave("sanitizer-buildbot8", properties={'jobs': 96}, max_builds=1),
 
         # Debian 7.7 x86_64 GCE instance
         create_slave("modules-slave-1", properties={'jobs': 16}, max_builds=1),

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py?rev=315949&r1=315948&r2=315949&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py Mon Oct 16 15:43:42 2017
@@ -22,6 +22,8 @@ BOT_ASSIGNMENT = {
     'sanitizer-x86_64-linux-autoconf': bash('buildbot_standard.sh'),
     'sanitizer-x86_64-linux-fuzzer': bash('buildbot_fuzzer.sh'),
     'sanitizer-x86_64-linux-android': bash('buildbot_android.sh'),
+    'sanitizer-x86_64-linux-bootstrap-msan': bash('buildbot_bootstrap_msan.sh'),
+    'sanitizer-x86_64-linux-bootstrap-ubsan': bash('buildbot_bootstrap_ubsan.sh'),
 }
 
 BOT_ADDITIONAL_ENV = {
@@ -33,6 +35,8 @@ BOT_ADDITIONAL_ENV = {
     'sanitizer-x86_64-linux-autoconf': {},
     'sanitizer-x86_64-linux-fuzzer': {},
     'sanitizer-x86_64-linux-android': {},
+    'sanitizer-x86_64-linux-bootstrap-msan': {},
+    'sanitizer-x86_64-linux-bootstrap-ubsan': {},
 }
 
 def Main():