Tweak ppc64 bot settings

[seurer]

Summary

The bots have exclusive use of one of the test machines now so I am upping the -j numbers to increase the throughput.

I am also changing the slave names to regularize them better reflect what the bots do instead of what hardware they were once on long ago.

[gkistanova]

Hi Bill,
You need also add these *new* slaves to slaves.py (create_slave...) and remove the slaves you do not use anymore from there.
Thanks
Galina

[seurer]

Updated slaves.py with the new names

[gkistanova]

LGTM. I will commit it.

Thanks

Galina

buildbot/osuosl/master/config/builders.py

 from zorg.buildbot.builders import ABITestsuitBuilder
 reload(ABITestsuitBuilder)
 from zorg.buildbot.builders import ABITestsuitBuilder
 
 # Plain LLVM builders.
 def _get_llvm_builders():
     return [
         {'name': "llvm-ppc64-linux1",
-         'slavenames':["chinook"],
+         'slavenames':["ppc64be-llvm"],
          'builddir':"llvm-ppc64",
-         'factory': LLVMBuilder.getLLVMBuildFactory("ppc64-linux-gnu", jobs=2, clean=False, timeout=20, config_name='Release+Asserts')},
+         'factory': LLVMBuilder.getLLVMBuildFactory("ppc64-linux-gnu", jobs=4, clean=False, timeout=20, config_name='Release+Asserts')},
 
         {'name': "ppc64le-llvm",
          'slavenames':["ppc64le-llvm"],
          'builddir':"llvm-ppc64le-1",
-         'factory': LLVMBuilder.getLLVMBuildFactory("ppc64le-linux-gnu", jobs=4, clean=False, timeout=20, config_name='Release+Asserts')},
+         'factory': LLVMBuilder.getLLVMBuildFactory("ppc64le-linux-gnu", jobs=2, clean=False, timeout=20, config_name='Release+Asserts')},
 
         {'name': "llvm-s390x-linux1",
          'slavenames':["systemz-1"],
          'builddir':"llvm-s390x-linux1",
          'factory': LLVMBuilder.getLLVMBuildFactory("s390x-linux-gnu", jobs=4, clean=False, timeout=20)},
 
         {'name': "llvm-mips-linux",
          'slavenames':["mipsswbrd002"],
return [
                         checkout_compiler_rt=False,
                         testStage1=False,
                         useTwoStage=True,
                         stage1_config='Release',
                         stage2_config='Release',
                         extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"])},
 
         {'name' : "clang-ppc64-elf-linux",
-         'slavenames' :["chinook-clangslave1"],
+         'slavenames' :["ppc64be-clang-lnt-test"],
          'builddir' :"clang-ppc64-1",
          'factory' : LNTBuilder.getLNTFactory(triple='ppc64-elf-linux1',
                                               nt_flags=['--multisample=3','--cflag','-mcpu=native'],
-                                              jobs=2,  use_pty_in_tests=True,
+                                              jobs=4,  use_pty_in_tests=True,
                                               testerName='O3-plain', run_cxx_tests=True)},
 
         {'name' : "clang-ppc64-elf-linux2",
-         'slavenames' :["chinook-clangslave2"],
+         'slavenames' :["ppc64be-clang-multistage-test"],
          'builddir' :"clang-ppc64-2",
          'factory' : ClangBuilder.getClangBuildFactory(triple='ppc64-elf-linux',
                                                        useTwoStage=True, test=True,
                                                        checkout_compiler_rt=True,
                                                        stage1_config='Release+Asserts',
                                                        stage2_config='Release+Asserts')},
 
         {'name' : "ppc64le-clanglnt",
-         'slavenames' :["ppc64le-clanglnt"],
+         'slavenames' :["ppc64le-clang-lnt-test"],
          'builddir' :"clang-lnt-ppc64le-1",
          'factory' : LNTBuilder.getLNTFactory(triple='ppc64le-elf-linux1',
                                               nt_flags=['--multisample=3','--cflag','-mcpu=native'],
                                               jobs=4,  use_pty_in_tests=True,
                                               testerName='ppc64le-plain', run_cxx_tests=True)},
 
         {'name' : "ppc64le-clang",
-         'slavenames' :["ppc64le-clang"],
+         'slavenames' :["ppc64le-clang-multistage-test"],
          'builddir' :"clang-ppc64le-1",
          'factory' : ClangBuilder.getClangBuildFactory(triple='ppc64le-elf-linux',
                                                        useTwoStage=True, test=True,
                                                        checkout_compiler_rt=True,
                                                        stage1_config='Release+Asserts',
                                                        stage2_config='Release+Asserts')},
 
         # Mips check-all with CMake builder
def _get_sanitizer_builders():
            'builddir':"sanitizer_x86_64-freebsd",
            'factory' : SanitizerBuilderII.getSanitizerBuildFactoryII(
                         clean=True,
                         sanitizers=['sanitizer','asan','lsan','tsan','ubsan'],
                         common_cmake_options=['-DCMAKE_EXE_LINKER_FLAGS=-lcxxrt',
                                               '-DLIBCXXABI_USE_LLVM_UNWINDER=ON'])},
 
           {'name': "sanitizer-ppc64-linux1",
-           'slavenames' :["sanitizer-ppc64-1"],
+           'slavenames' :["ppc64be-sanitizer"],
            'builddir': "sanitizer-ppc64-1",
            'factory': SanitizerBuilder.getSanitizerBuildFactory(timeout=1800)},
 
           {'name': "sanitizer-ppc64le-linux",
-           'slavenames' :["sanitizer-ppc64le-linux"],
+           'slavenames' :["ppc64le-sanitizer"],
            'builddir': "sanitizer-ppc64le-1",
            'factory': SanitizerBuilder.getSanitizerBuildFactory(timeout=1800)},
 
           {'name': "sanitizer-windows",
            'slavenames' :["sanitizer-windows"],
            'builddir': "sanitizer-windows",
            'factory': SanitizerBuilderWindows.getSanitizerWindowsBuildFactory()},
 

  'factory' : ClangBuilder.getClangBuildFactory(triple='i686-pc-mingw32',
                                                        useTwoStage=True, test=False,
                                                        stage1_config='Release+Asserts',
                                                        stage2_config='Release+Asserts')},
 
 def _get_experimental_scheduled_builders():
     return [
         {'name': "llvm-ppc64-linux2",
-         'slavenames':["coho"],
+         'slavenames':["ppc64be-llvm-quick"],
          'builddir':"llvm-ppc64-2",
-         'factory': LLVMBuilder.getLLVMBuildFactory("ppc64-linux-gnu", jobs=2, clean=False, timeout=20, config_name='Release+Asserts'),
+         'factory': LLVMBuilder.getLLVMBuildFactory("ppc64-linux-gnu", jobs=4, clean=False, timeout=20, config_name='Release+Asserts'),
          'category' : 'llvm'},
 
         {'name': "clang-atom-d525-fedora",
          'slavenames':["atom-buildbot"],
          'builddir':"clang-atom-d525-fedora",
          'factory' : ClangBuilder.getClangBuildFactory(extra_configure_args=["--enable-shared",
                                                                              "--with-intel-jitevents"]),
          'category' : 'clang'},

buildbot/osuosl/master/config/slaves.py

return [
         create_slave("atom1-buildbot", properties={'jobs': 2}, max_builds=1),
 
         # Windows 7 Intel(R) Xeon(R) CPU E5-2680 (2.80GHz), 16GB of RAM
         create_slave("windows7-buildbot", properties={'jobs': 2}, max_builds=1),
 
         # LLVM Lab slaves
         create_slave("hpproliant1", properties={'jobs': 6}, max_builds=1),
 
-        # POWER7 PowerPC (powerpc64), Fedora16.
-        create_slave("chinook", properties={'jobs': 4}, max_builds=2),
-        #    LNT slave
-        create_slave("chinook-clangslave1", properties={'jobs': 4}, max_builds=2),
-        #    Clang build slave
-        create_slave("chinook-clangslave2", properties={'jobs': 4}, max_builds=2),
-
-        # POWER7 PowerPC (powerpc64), Fedora16.
-        create_slave("coho", properties={'jobs': 4}, max_builds=2),
-
-        create_slave("sanitizer-ppc64-1", properties={'jobs': 4}, max_builds=1),
-
-        # ppc64le slaves.  
-        create_slave("ppc64le-llvm", properties={'jobs': 8}, max_builds=1),
-        create_slave("ppc64le-clang", properties={'jobs': 8}, max_builds=1),
-        create_slave("ppc64le-clanglnt", properties={'jobs': 8}, max_builds=1),
-        create_slave("sanitizer-ppc64le-linux", properties={'jobs': 8}, max_builds=1),
+        # POWER7 PowerPC big endian (powerpc64)
+        create_slave("ppc64be-llvm", properties={'jobs': 8}, max_builds=2),
+        create_slave("ppc64be-clang-lnt-test", properties={'jobs': 8}, max_builds=2),
+        create_slave("ppc64be-clang-multistage-test", properties={'jobs': 8}, max_builds=2),
+        create_slave("ppc64be-sanitizer", properties={'jobs': 8}, max_builds=1),
+        create_slave("ppc64be-llvm-quick", properties={'jobs': 8}, max_builds=2),
+
+        # POWER 8 PowerPC little endian (powerpc64le)
+        create_slave("ppc64le-llvm", properties={'jobs': 4}, max_builds=1),
+        create_slave("ppc64le-clang-lnt-test", properties={'jobs': 4}, max_builds=1),
+        create_slave("ppc64le-clang-multistage-test", properties={'jobs': 4}, max_builds=1),
+        create_slave("ppc64le-sanitizer", properties={'jobs': 4}, max_builds=1),
 
         # Debian 86_64, 2 x 6-core Opteron 2.6 GHz
         create_slave("osu8", properties={'jobs' : 6}, max_builds=2),
 
         # Windows 6.1.7601 x86-64, Intel(R) Xeon(R) CPU E5-2680 0 @ 2.70GHz
         create_slave("hexagon-build-01", properties={'jobs': 4}, max_builds=2),
 
         # TODO: This slave is idle for now. Review the usage later.