[PATCH 2/6] [zorg] Use slave's "jobs" setting for ARM 32-bit bots.

[maxim-kuvyrkov]

Summary

Use slave's "jobs" setting for ARM 32-bit bots.

[rovka]

LGTM, but I have a couple of nitpicks:

• Why is this PATCH 2/6? It doesn't seem related to either 1/6 or 3/6 and can be committed independently
• The summary just repeats the title. A better summary would be something along the lines of "Don't force the number of jobs on the ARM builders. This makes it possible to fall back on the number of jobs configured for the slave instead."

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

return [
                       submitURL='http://lnt.llvm.org/submitRun',
                       testerName='LNT-Thumb2v7-A15-O3')},
 
         # Cortex-A15 LNT test-suite in test-only mode
         {'name' : "clang-native-arm-lnt",
          'slavenames':["linaro-tk1-03"],
          'builddir':"clang-native-arm-lnt",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=False,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -marm',
                                        '--threads=4', '--build-threads=4'],
                       extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         ## Cortex-A15 check-all self-host NEON with CMake builder
         {'name': "clang-cmake-armv7-a15-selfhost-neon",
          'slavenames':["linaro-tk1-04"],
          'builddir':"clang-cmake-armv7-a15-selfhost-neon",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       useTwoStage=True,
                       testStage1=False,
                       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-a15 -marm'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                         "-DLLVM_LIT_ARGS='-sv -j2'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         ## Cortex-A15 check-all with CMake builder
         {'name': "clang-cmake-armv7-a15",
          'slavenames':["linaro-tk1-06"],
          'builddir':"clang-cmake-armv7-a15",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
                                         "-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"])},
 
         ## Cortex-A15 check-all with CMake T2 builder
         {'name': "clang-cmake-thumbv7-a15",
          'slavenames':["linaro-tk1-09"],
          'builddir':"clang-cmake-thumbv7-a15",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -mthumb'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -mthumb'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                         "-DLLVM_LIT_ARGS='-sv -j4'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         ## Cortex-A15 check-all self-host with CMake builder
         {'name': "clang-cmake-armv7-a15-selfhost",
          'slavenames':["linaro-tk1-07"],
          'builddir':"clang-cmake-armv7-a15-selfhost",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       useTwoStage=True,
                       testStage1=False,
                       extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
def _get_sanitizer_builders():
            'factory': SanitizerBuilderWindows.getSanitizerWindowsBuildFactory(
                         vs='%VS140COMNTOOLS%')},
 
           ## Cortex-A15 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
           {'name': "clang-cmake-armv7-a15-full",
            'slavenames':["linaro-tk1-08"],
            'builddir':"clang-cmake-armv7-a15-full",
            'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                        jobs=4,
                         clean=False,
                         checkout_lld=False,
                         extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
                                           "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
                                           "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
                                           "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
                                           "-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
                                           "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                           "-DLLVM_LIT_ARGS='-sv -j4'",
                                           "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
           ## Cortex-A15 Thumb2 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
           {'name': "clang-cmake-thumbv7-a15-full-sh",
            'slavenames':["linaro-tk1-05"],
            'builddir':"clang-cmake-thumbv7-a15-full-sh",
            'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                        jobs=4,
                         clean=False,
                         checkout_lld=False,
                         useTwoStage=True,
                         testStage1=False,
                         extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
                                           "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
                                           "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
                                           "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mthumb'",