[zorg] Update container-based Linaro slaves
Summary:
Update container-based Linaro slaves to not include machine name
"linaro-armv8-01", since these slaves are now served by docker
containers on several Linaro machines.
Also decrease "jobs" property setting for such builders from 64 to 32.
These builders share 32-core and 64-core machines, and even on 64-core
machine they can get at most 32-thread parallelism.
Reviewers: gkistanova, olista01, rovka, yroux, omjavaid, ostannard
Reviewed By: gkistanova, ostannard
Subscribers: ostannard, kristof.beyls
Differential Revision: https://reviews.llvm.org/D80573
diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index 02703ea..2e0e0b9 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -275,7 +275,7 @@
# ARMv7 LNT test-suite in test-only mode
{'name' : "clang-cmake-armv7-lnt",
- 'slavenames':["linaro-armv8-01-arm-lnt"],
+ 'slavenames':["linaro-armv7-lnt"],
'builddir':"clang-cmake-armv7-lnt",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
@@ -290,7 +290,7 @@
## ARMv7 check-all self-host NEON with CMake builder
{'name': "clang-cmake-armv7-selfhost-neon",
- 'slavenames':["linaro-armv8-01-arm-selfhost-neon"],
+ 'slavenames':["linaro-armv7-selfhost"],
'builddir':"clang-cmake-armv7-selfhost-neon",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
@@ -304,7 +304,7 @@
## ARMv7 check-all with CMake builder
{'name': "clang-cmake-armv7-quick",
- 'slavenames':["linaro-armv8-01-arm-quick"],
+ 'slavenames':["linaro-armv7-quick"],
'builddir':"clang-cmake-armv7-quick",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
@@ -314,7 +314,7 @@
## ARMv7 Clang + LLVM run test-suite with GlobalISel enabled
{'name' : "clang-cmake-armv7-global-isel",
- 'slavenames':["linaro-armv8-01-arm-global-isel"],
+ 'slavenames':["linaro-armv7-global-isel"],
'builddir':"clang-cmake-armv7-global-isel",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
@@ -329,7 +329,7 @@
## ARMv7 check-all self-host with CMake builder
{'name': "clang-cmake-armv7-selfhost",
- 'slavenames':["linaro-armv8-01-arm-selfhost-neon"],
+ 'slavenames':["linaro-armv7-selfhost"],
'builddir':"clang-cmake-armv7-selfhost",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
@@ -343,7 +343,7 @@
## AArch64 Clang+LLVM check-all + test-suite
{'name': "clang-cmake-aarch64-quick",
- 'slavenames':["linaro-armv8-01-aarch64-quick"],
+ 'slavenames':["linaro-aarch64-quick"],
'builddir':"clang-cmake-aarch64-quick",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
@@ -359,7 +359,7 @@
## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite
{'name': "clang-cmake-aarch64-lld",
- 'slavenames':["linaro-armv8-01-aarch64-lld"],
+ 'slavenames':["linaro-aarch64-lld"],
'builddir':"clang-cmake-aarch64-lld",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
@@ -379,7 +379,7 @@
## AArch64 Clang+LLVM run test-suite at -O0 (GlobalISel is now default).
{'name': "clang-cmake-aarch64-global-isel",
- 'slavenames':["linaro-armv8-01-aarch64-global-isel"],
+ 'slavenames':["linaro-aarch64-global-isel"],
'builddir':"clang-cmake-aarch64-global-isel",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
@@ -432,7 +432,7 @@
## AArch32 Self-hosting Clang+LLVM check-all + LLD + test-suite
# Sanitizers build disabled due to PR38690
{'name': "clang-cmake-armv8-lld",
- 'slavenames':["linaro-armv8-01-arm-lld"],
+ 'slavenames':["linaro-armv8-lld"],
'builddir':"clang-cmake-armv8-lld",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
@@ -453,7 +453,7 @@
# AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting
{'name': "clang-cmake-aarch64-full",
- 'slavenames':["linaro-armv8-01-aarch64-full"],
+ 'slavenames':["linaro-aarch64-full"],
'builddir':"clang-cmake-aarch64-full",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
@@ -949,7 +949,7 @@
'-DCMAKE_C_COMPILER=clang',
'-DCMAKE_CXX_COMPILER=clang++'])},
{'name': "lldb-aarch64-ubuntu",
- 'slavenames': ["linaro-thx1-lldb-aarch64"],
+ 'slavenames': ["linaro-aarch64-lldb"],
'builddir': "lldb-cmake-aarch64",
'category' : 'lldb',
'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
@@ -962,7 +962,7 @@
'-DCMAKE_C_COMPILER=clang',
'-DCMAKE_CXX_COMPILER=clang++'])},
{'name': "lldb-arm-ubuntu",
- 'slavenames': ["linaro-armv8-01-lldb-arm"],
+ 'slavenames': ["linaro-arm-lldb"],
'builddir': "lldb-cmake-arm",
'category' : 'lldb',
'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
@@ -1391,7 +1391,7 @@
# ARMv8 LibC++ and LibC++abi tests (require Clang+RT)
{'name': 'libcxx-libcxxabi-libunwind-armv8-linux',
- 'slavenames': ['linaro-armv8-01-arm-libcxx'],
+ 'slavenames': ['linaro-armv8-libcxx'],
'builddir': 'libcxx-libcxxabi-libunwind-armv8-linux',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
@@ -1414,7 +1414,7 @@
# ARMv8 LibC++ and LibC++abi tests w/o EH (require Clang+RT)
{'name': 'libcxx-libcxxabi-libunwind-armv8-linux-noexceptions',
- 'slavenames': ['linaro-armv8-01-arm-libcxx-noeh'],
+ 'slavenames': ['linaro-armv8-libcxx'],
'builddir': 'libcxx-libcxxabi-libunwind-armv8-linux-noexceptions',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
@@ -1426,7 +1426,7 @@
# AArch64 LibC++ and LibC++abi tests (require Clang+RT)
{'name': 'libcxx-libcxxabi-libunwind-aarch64-linux',
- 'slavenames': ['linaro-armv8-01-aarch64-libcxx'],
+ 'slavenames': ['linaro-aarch64-libcxx'],
'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
@@ -1435,7 +1435,7 @@
'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57'})},
{'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
- 'slavenames': ['linaro-armv8-01-aarch64-libcxx-noeh'],
+ 'slavenames': ['linaro-aarch64-libcxx'],
'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
diff --git a/buildbot/osuosl/master/config/slaves.py b/buildbot/osuosl/master/config/slaves.py
index f486381..f8aff0a 100644
--- a/buildbot/osuosl/master/config/slaves.py
+++ b/buildbot/osuosl/master/config/slaves.py
@@ -19,7 +19,7 @@
# Mac Pro 2.7 GHz 12-Core Intel Xeon E5, Maverick 10.9.2
create_slave("as-bldslv9", properties={'jobs' : 8}, max_builds=4),
- # ARMv7 Linaro slaves
+ # ARMv7/ARMv8 Linaro slaves
create_slave("linaro-tk1-01", properties={'jobs' : 4}, max_builds=1),
create_slave("linaro-tk1-02", properties={'jobs' : 4}, max_builds=1),
create_slave("linaro-tk1-03", properties={'jobs' : 4}, max_builds=1),
@@ -29,28 +29,25 @@
create_slave("linaro-tk1-07", properties={'jobs' : 4}, max_builds=1),
create_slave("linaro-tk1-08", properties={'jobs' : 4}, max_builds=1),
create_slave("linaro-tk1-09", properties={'jobs' : 4}, max_builds=1),
- create_slave("linaro-armv8-01-arm-lnt", properties={'jobs' : 64}, max_builds=1),
- create_slave("linaro-armv8-01-arm-selfhost-neon", properties={'jobs' : 64}, max_builds=1),
- create_slave("linaro-armv8-01-arm-quick", properties={'jobs' : 64}, max_builds=1),
- create_slave("linaro-armv8-01-arm-global-isel", properties={'jobs' : 64}, max_builds=1),
- create_slave("linaro-armv8-01-arm-lld", properties={'jobs' : 64}, max_builds=1),
+ create_slave("linaro-armv7-lnt", properties={'jobs' : 32}, max_builds=1),
+ create_slave("linaro-armv7-selfhost", properties={'jobs' : 32}, max_builds=1),
+ create_slave("linaro-armv7-quick", properties={'jobs' : 32}, max_builds=1),
+ create_slave("linaro-armv7-global-isel", properties={'jobs' : 32}, max_builds=1),
+ create_slave("linaro-armv8-lld", properties={'jobs' : 32}, max_builds=1),
# Libcxx testsuite has tests with timing assumptions. Run single-threaded to make
# sure we have plenty CPU cycle to satisfy timing assumptions.
- create_slave("linaro-armv8-01-arm-libcxx", properties={'jobs' : 1}, max_builds=1),
- create_slave("linaro-armv8-01-arm-libcxx-noeh", properties={'jobs' : 1}, max_builds=1),
- create_slave("linaro-armv8-01-lldb-arm", properties={'jobs' : 8}, max_builds=1),
- # Packet.Net ThunderX1 for LLDB buildbot - Ubuntu Xenial 16.04 arm64 container
- create_slave("linaro-thx1-lldb-aarch64", properties={'jobs': 32}, max_builds=1),
+ create_slave("linaro-armv8-libcxx", properties={'jobs' : 1}, max_builds=1),
+ create_slave("linaro-arm-lldb", properties={'jobs' : 32}, max_builds=1),
# AArch64 Linaro slaves
- 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-aarch64-quick", properties={'jobs' : 32}, max_builds=1),
+ create_slave("linaro-aarch64-full", properties={'jobs' : 32}, max_builds=1),
+ create_slave("linaro-aarch64-global-isel", properties={'jobs' : 32}, max_builds=1),
+ create_slave("linaro-aarch64-lld", properties={'jobs' : 32}, max_builds=1),
# Libcxx testsuite has tests with timing assumptions. Run single-threaded to make
# sure we have plenty CPU cycle to satisfy timing assumptions.
- create_slave("linaro-armv8-01-aarch64-libcxx", properties={'jobs' : 1}, max_builds=1),
- create_slave("linaro-armv8-01-aarch64-libcxx-noeh", properties={'jobs' : 1}, max_builds=1),
+ create_slave("linaro-aarch64-libcxx", properties={'jobs' : 1}, max_builds=1),
+ create_slave("linaro-aarch64-lldb", properties={'jobs': 32}, max_builds=1),
# ARMv7 build cache slave
create_slave("packet-linux-armv7-slave-1", properties={'jobs' : 64}, max_builds=1),
