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 @@ -964,7 +964,7 @@ {'name': "cross-project-tests-sie-ubuntu", 'tags' : ["clang", "llvm", "lldb", "cross-project-tests"], - 'workernames': ["sie-linux-worker"], + 'workernames': ["doug-worker-1a"], 'builddir': "cross-project-tests-sie-ubuntu", 'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory( depends_on_projects=['llvm','clang','lldb','cross-project-tests'], @@ -978,13 +978,13 @@ "-DLLVM_CCACHE_BUILD=ON", "-DLLVM_INCLUDE_EXAMPLES=OFF", "-DLLVM_ENABLE_ASSERTIONS=ON", - "-DLLVM_LIT_ARGS=--verbose -j100", + "-DLLVM_LIT_ARGS=--verbose", "-DLLVM_TARGETS_TO_BUILD=X86", "-DLLVM_USE_LINKER=gold"])}, {'name': "cross-project-tests-sie-ubuntu-dwarf5", 'tags' : ["clang", "llvm", "lldb", "cross-project-tests"], - 'workernames': ["sie-slow-linux-worker"], + 'workernames': ["doug-worker-1b"], 'builddir': "cross-project-tests-sie-ubuntu-dwarf5", 'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory( depends_on_projects=['llvm','clang','lldb','cross-project-tests'], @@ -998,13 +998,13 @@ "-DLLVM_CCACHE_BUILD=ON", "-DLLVM_INCLUDE_EXAMPLES=OFF", "-DLLVM_ENABLE_ASSERTIONS=ON", - "-DLLVM_LIT_ARGS=--verbose -j24", + "-DLLVM_LIT_ARGS=--verbose", "-DLLVM_TARGETS_TO_BUILD=X86", "-DLLVM_USE_LINKER=gold"])}, {'name': "llvm-clang-x86_64-gcc-ubuntu", 'tags' : ["llvm", "clang", "clang-tools-extra", "compiler-rt", "lld", "cross-project-tests"], - 'workernames': ["doug-linux-worker1"], + 'workernames': ["doug-worker-2a"], 'builddir': "llvm-clang-x86_64-gcc-ubuntu", 'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory( depends_on_projects=['llvm','clang','clang-tools-extra','compiler-rt','lld','cross-project-tests'], diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py --- a/buildbot/osuosl/master/config/workers.py +++ b/buildbot/osuosl/master/config/workers.py @@ -279,10 +279,13 @@ # Ubuntu 20.04 on AWS, x86_64 PS4 target create_worker("sie-linux-worker", properties={'jobs': 40}, max_builds=1), - # Ubuntu 22.04 on 2012 Mac Mini - create_worker("sie-slow-linux-worker", properties={'jobs': 8}, max_builds=1), - # Ubuntu 18.04 on x86_64 - create_worker("doug-linux-worker1", properties={'jobs': 16}, max_builds=1), + # 2012 Mac Mini host, 16GB memory: + # - Ubuntu 18.04 in docker container + create_worker("doug-worker-1a", properties={'jobs': 8}, max_builds=1), + # - Ubuntu 22.04 in docker container + create_worker("doug-worker-1b", properties={'jobs': 8}, max_builds=1), + # Ubuntu 18.04 in docker container on Ryzen 4800U + create_worker("doug-worker-2a", properties={'jobs': 16}, max_builds=1), # Windows Server 2019 on AWS, x86_64 PS4 target create_worker("sie-win-worker", properties={'jobs': 64}, max_builds=1),