[PATCH 4/6] [zorg] Rename linaro-d05-01-* slaves to linaro-armv8-01-*

[maxim-kuvyrkov]

Summary

... for consistency with upcoming aarch32 slaves.
[Random cleanup] Also remove unused BOTO_CONFIG from env.

[rovka]

LGTM, but I think you should commit the BOTO change separately.

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

return [
                                         "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                         "-DLLVM_LIT_ARGS='-sv -j4'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         ## AArch64 Clang+LLVM check-all + test-suite
         {'name': "clang-cmake-aarch64-quick",
-         'slavenames':["linaro-apm-01", "linaro-d05-01-quick"],
+         'slavenames':["linaro-apm-01", "linaro-armv8-01-aarch64-quick"],
          'builddir':"clang-cmake-aarch64-quick",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
                                        '--threads=8', '--build-threads=8'],
                       env={'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
                       extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
         ## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite
         ## TODO: Remove the X86 back-end after fixing the 90 bad tests
         ## TODO: Add Compiler-RT after fixing all the failures
         ## TODO: Fix the three remaining test-suite failures
         {'name': "clang-cmake-aarch64-lld",
-         'slavenames':["linaro-apm-04", "linaro-d05-01-lld"],
+         'slavenames':["linaro-apm-04", "linaro-armv8-01-aarch64-lld"],
          'builddir':"clang-cmake-aarch64-lld",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=True,
                       test=True,
                       useTwoStage=True,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags',
                                        '-mcpu=cortex-a57 -fuse-ld=lld',
                                        '--threads=8', '--build-threads=8'],
                       extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_C_COMPILER='clang'",
                                         "-DCMAKE_CXX_COMPILER='clang++'",
                                         "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
                                         "-DLLVM_ENABLE_LLD=True"],
                ),
          'category'   : 'lld'},
 
         ## AArch64 Clang+LLVM run test-suite with GlobalISel enabled
         {'name': "clang-cmake-aarch64-global-isel",
-         'slavenames':["linaro-apm-06", "linaro-d05-01-global-isel"],
+         'slavenames':["linaro-apm-06", "linaro-armv8-01-aarch64-global-isel"],
          'builddir':"clang-cmake-aarch64-global-isel",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
def _get_sanitizer_builders():
                                           "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mthumb'",
                                           "-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mthumb'",
                                           "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                           "-DLLVM_LIT_ARGS='-sv -j2'",
                                           "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         # AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting
         {'name': "clang-cmake-aarch64-full",
-         'slavenames':["linaro-apm-02", "linaro-apm-05", "linaro-d05-01-full"],
+         'slavenames':["linaro-apm-02", "linaro-apm-05", "linaro-armv8-01-aarch64-full"],
          'builddir':"clang-cmake-aarch64-full",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=True,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=True,
                       testStage1=False,
return [
                               'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
                               'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb',
                               'LLVM_PARALLEL_LINK_JOBS': '2'})},
 
         # AArch64 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux',
-         'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx'],
+         'slavenames': ['linaro-apm-03', 'linaro-armv8-01-aarch64-libcxx'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_C_COMPILER': 'clang',
                               'CMAKE_CXX_COMPILER': 'clang++',
                               'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a57',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57',
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
-         'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx-noexceptions'],
+         'slavenames': ['linaro-apm-03', 'linaro-armv8-01-aarch64-libcxx-noeh'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_C_COMPILER': 'clang',
                               'CMAKE_CXX_COMPILER': 'clang++',
                               'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',

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

return [
 
         # AArch64 Linaro slaves
         create_slave("linaro-apm-01", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-02", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-03", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-04", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-05", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-06", properties={'jobs' : 8}, max_builds=1),
-        create_slave("linaro-d05-01-quick", properties={'jobs' : 64}, max_builds=1),
-        create_slave("linaro-d05-01-full", properties={'jobs' : 64}, max_builds=1),
-        create_slave("linaro-d05-01-global-isel", properties={'jobs' : 64}, max_builds=1),
-        create_slave("linaro-d05-01-lld", properties={'jobs' : 64}, max_builds=1),
-        create_slave("linaro-d05-01-libcxx", properties={'jobs' : 64}, max_builds=1),
-        create_slave("linaro-d05-01-libcxx-noexceptions", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-quick", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-full", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-global-isel", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-lld", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-libcxx", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-libcxx-noeh", properties={'jobs' : 64}, max_builds=1),
 
         # AMD Athlon(tm) 64 X2 Dual Core 3800+, Ubuntu x86_64
         create_slave("grosser1", properties={'jobs': 2}, max_builds=1),
 
         # Intel(R) Core(TM)2 Quad CPU Q6600  @ 2.40GHz, Debian x86_64 GNU/Linux
         #create_slave("grosser2", properties={'jobs': 4}, max_builds=1),
 
         # Polly perf servers