[zorg] r306051 - [sanitizers] Add Android builder and slave

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Thu Jun 22 15:22:39 2017
New Revision: 306051

URL: http://llvm.org/viewvc/llvm-project?rev=306051&view=rev
Log:
[sanitizers] Add Android builder and slave

Reviewers: eugenis, alekseyshl

Subscribers: srhines

Differential Revision: https://reviews.llvm.org/D34522

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=306051&r1=306050&r2=306051&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Jun 22 15:22:39 2017
@@ -898,6 +898,11 @@ def _get_sanitizer_builders():
            'builddir': "sanitizer-x86_64-linux-fuzzer",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
 
+           {'name': "sanitizer-x86_64-linux-android",
+           'slavenames' :["sanitizer-buildbot6"],
+           'builddir': "sanitizer-x86_64-linux-android",
+           'factory': SanitizerBuilder.getSanitizerBuildFactory()},
+
           {'name': "sanitizer-ppc64be-linux",
            'slavenames' :["ppc64be-sanitizer"],
            'builddir': "sanitizer-ppc64be",

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=306051&r1=306050&r2=306051&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Thu Jun 22 15:22:39 2017
@@ -136,6 +136,8 @@ def get_build_slaves():
         create_slave("sanitizer-buildbot4", properties={'jobs': 8}, max_builds=1),
         # Debian 7.7 x86_64 8-core GCE instance
         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("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=306051&r1=306050&r2=306051&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py Thu Jun 22 15:22:39 2017
@@ -21,6 +21,7 @@ BOT_ASSIGNMENT = {
     'sanitizer-x86_64-linux-fast': bash('buildbot_fast.sh'),
     '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'),
 }
 
 BOT_ADDITIONAL_ENV = {
@@ -31,6 +32,7 @@ BOT_ADDITIONAL_ENV = {
     'sanitizer-x86_64-linux-fast': {},
     'sanitizer-x86_64-linux-autoconf': {},
     'sanitizer-x86_64-linux-fuzzer': {},
+    'sanitizer-x86_64-linux-android': {},
 }
 
 def Main():