diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -27,6 +27,15 @@ reload(HtmlDocsBuilder) reload(DoxygenDocsBuilder) +# These are same VM so scheduler builds on any of them. +sanitizer_workers = [ + "sanitizer-buildbot1", + "sanitizer-buildbot2", + "sanitizer-buildbot3", + "sanitizer-buildbot4", + "sanitizer-buildbot7", + "sanitizer-buildbot8", +] all = [ @@ -1194,89 +1203,49 @@ {'name' : "sanitizer-x86_64-linux", 'tags' : ["sanitizer"], - 'workernames' : [ - "sanitizer-buildbot1", - "sanitizer-buildbot2", - "sanitizer-buildbot4", - "sanitizer-buildbot8", - ], + 'workernames' : sanitizer_workers, 'builddir': "sanitizer-x86_64-linux", 'factory' : SanitizerBuilder.getSanitizerBuildFactory()}, {'name' : "sanitizer-x86_64-linux-fast", 'tags' : ["sanitizer"], - 'workernames' : [ - "sanitizer-buildbot1", - "sanitizer-buildbot2", - "sanitizer-buildbot4", - "sanitizer-buildbot8", - ], + 'workernames' : sanitizer_workers, 'builddir': "sanitizer-x86_64-linux-fast", 'factory' : SanitizerBuilder.getSanitizerBuildFactory()}, {'name' : "sanitizer-x86_64-linux-bootstrap-asan", 'tags' : ["sanitizer"], - 'workernames' : [ - "sanitizer-buildbot3", - "sanitizer-buildbot2", - "sanitizer-buildbot4", - "sanitizer-buildbot8", - ], + 'workernames' : sanitizer_workers, 'builddir': "sanitizer-x86_64-linux-bootstrap-asan", 'factory' : SanitizerBuilder.getSanitizerBuildFactory()}, {'name' : "sanitizer-x86_64-linux-bootstrap-ubsan", 'tags' : ["sanitizer"], - 'workernames' : [ - "sanitizer-buildbot3", - "sanitizer-buildbot2", - "sanitizer-buildbot4", - "sanitizer-buildbot8", - ], + 'workernames' : sanitizer_workers, 'builddir': "sanitizer-x86_64-linux-bootstrap-ubsan", 'factory' : SanitizerBuilder.getSanitizerBuildFactory()}, {'name' : "sanitizer-x86_64-linux-bootstrap-msan", 'tags' : ["sanitizer"], - 'workernames' : [ - "sanitizer-buildbot7", - "sanitizer-buildbot2", - "sanitizer-buildbot4", - "sanitizer-buildbot8", - ], + 'workernames' : sanitizer_workers, 'builddir': "sanitizer-x86_64-linux-bootstrap-msan", 'factory' : SanitizerBuilder.getSanitizerBuildFactory()}, {'name' : "sanitizer-x86_64-linux-autoconf", 'tags' : ["sanitizer"], - 'workernames' : [ - "sanitizer-buildbot7", - "sanitizer-buildbot2", - "sanitizer-buildbot4", - "sanitizer-buildbot8", - ], + 'workernames' : sanitizer_workers, 'builddir': "sanitizer-x86_64-linux-autoconf", 'factory' : SanitizerBuilder.getSanitizerBuildFactory()}, {'name' : "sanitizer-x86_64-linux-qemu", 'tags' : ["sanitizer"], - 'workernames' : [ - "sanitizer-buildbot7", - "sanitizer-buildbot2", - "sanitizer-buildbot4", - "sanitizer-buildbot8", - ], + 'workernames' : sanitizer_workers, 'builddir': "sanitizer-x86_64-linux-qemu", 'factory' : SanitizerBuilder.getSanitizerBuildFactory()}, {'name' : "sanitizer-x86_64-linux-fuzzer", 'tags' : ["sanitizer"], - 'workernames' : [ - "sanitizer-buildbot7", - "sanitizer-buildbot2", - "sanitizer-buildbot4", - "sanitizer-buildbot8", - ], + 'workernames' : sanitizer_workers, 'builddir': "sanitizer-x86_64-linux-fuzzer", 'factory' : SanitizerBuilder.getSanitizerBuildFactory()},