[sanitizers] Add Android builder and slave

[eugenis]

zorg/trunk/buildbot/osuosl/master/config/builders.py

901 ↗

(On Diff #103627)

I'd just call it "sanitizer-android".

[vitalybuka]

zorg/trunk/buildbot/osuosl/master/config/builders.py

901 ↗

(On Diff #103627)

I don't have strong preferences, but assuming that we rely on particular NDK and Platform Tools, x86_64-linux is requirement.

[eugenis]

zorg/trunk/buildbot/osuosl/master/config/builders.py

901 ↗

(On Diff #103627)

Me neither, but "x86_64-linux" in the name is irrelevant - the bot is testing android first of all.

buildbot/osuosl/master/config/builders.py

def _get_sanitizer_builders():
            'builddir': "sanitizer-x86_64-linux-autoconf",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
 
           {'name': "sanitizer-x86_64-linux-fuzzer",
            'slavenames' :["sanitizer-buildbot5"],
            '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",
            'factory': SanitizerBuilder.getSanitizerBuildFactory(timeout=1800)},
 
           {'name': "sanitizer-ppc64le-linux",
            'slavenames' :["ppc64le-sanitizer"],
            'builddir': "sanitizer-ppc64le",

buildbot/osuosl/master/config/slaves.py

return [
         # Debian 7.7 x86_64 16-core GCE instance
         create_slave("sanitizer-buildbot2", properties={'jobs': 16}, max_builds=1),
         # Debian 7.7 x86_64 8-core GCE instance
         create_slave("sanitizer-buildbot3", properties={'jobs': 8}, max_builds=1),
         # Debian 7.7 x86_64 8-core GCE instance
         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.2 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),
 
         # Debian 7.7 x86_64 GCE instance
         create_slave("modules-slave-2", properties={'jobs': 16}, max_builds=1),
 
         # IBM z13 (s390x), Ubuntu 16.04.2

zorg/buildbot/builders/sanitizers/buildbot_selector.py

 BOT_ASSIGNMENT = {
     'sanitizer-ppc64le-linux': bash('buildbot_cmake.sh'),
     'sanitizer-ppc64be-linux': bash('buildbot_cmake.sh'),
     'sanitizer-x86_64-linux': bash('buildbot_cmake.sh'),
     'sanitizer-x86_64-linux-bootstrap': bash('buildbot_bootstrap.sh'),
     '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 = {
     'sanitizer-ppc64le-linux': { 'HAVE_NINJA': '1', 'CHECK_LIBCXX': '0', 'CHECK_LLD': '0' },
     'sanitizer-ppc64be-linux': { 'HAVE_NINJA': '1', 'CHECK_LIBCXX': '0', 'CHECK_LLD': '0' },
     'sanitizer-x86_64-linux': { 'HAVE_NINJA' : '1' },
     'sanitizer-x86_64-linux-bootstrap': {},
     'sanitizer-x86_64-linux-fast': {},
     'sanitizer-x86_64-linux-autoconf': {},
     'sanitizer-x86_64-linux-fuzzer': {},
+    'sanitizer-x86_64-linux-android': {},
 }
 
 def Main():
   builder = os.environ.get('BUILDBOT_BUILDERNAME')
   print "builder name: %s" % (builder)
   cmd = BOT_ASSIGNMENT.get(builder)
   if not cmd:
     sys.stderr.write('ERROR - unset/invalid builder name\n')