Rename and reassign a few SIE workers/builders

[dyung]

Summary

This change makes the worker names a little more consistent and also reassigns one job from the fast sie-linux-worker to a slower one so that the fast builder can cycle more quickly.

sie-slow-linux-worker was renamed to doug-worker-1(ab). A and B represent two different docker containers running on the same host, but with different configurations. The builder cross-project-tests-sie-ubuntu was moved to this slower worker. The builder cross-project-tests-sie-ubuntu-dwarf5 was also moved to the new worker name.

doug-linux-worker1 was renamed to doug-worker-2a in an attempt to keep my naming consistent and make it easier for me to remember which hardware each job is running on.

[dyung]

ping

[gkistanova]

The patch itself looks Ok.

Renaming workers means some extra cleaning on the buildbot, and we need to coordinate the worker credentials and when you will take the current workers down and will start the new.

How about committing this patch on Friday late afternoon, like 5:00 PM PST, so I could take the buildbot down without interfering with the normal activity? That would be a good time for you to shut the current workers down and bring the new up.

I assume this is one time change, right?

Please send me directly the new credentials.

[dyung]

In D138726#3978979, @gkistanova wrote:

The patch itself looks Ok.

Renaming workers means some extra cleaning on the buildbot, and we need to coordinate the worker credentials and when you will take the current workers down and will start the new.

How about committing this patch on Friday late afternoon, like 5:00 PM PST, so I could take the buildbot down without interfering with the normal activity? That would be a good time for you to shut the current workers down and bring the new up.

I assume this is one time change, right?

Please send me directly the new credentials.

Yes this should hopefully be a one time change. Friday 5pm PST works for me to commit the patch. I will send you an email with the new credentials.

buildbot/osuosl/master/config/builders.py

'factory' : UnifiedTreeBuilder.getCmakeWithNinjaWithMSVCBuildFactory(
                         "-DLLVM_VERSION_SUFFIX=",
                         "-DLLVM_BUILD_RUNTIME=OFF",
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
                         "-DLLVM_LIT_ARGS=--verbose -j61",
                         "-DPYTHON_EXECUTABLE=C:\Python310\python.exe"])},
 
     {'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'],
                     checks = ['check-cross-project'],
                     extra_configure_args=[
                         "-DCMAKE_C_COMPILER=gcc",
                         "-DCMAKE_CXX_COMPILER=g++",
                         "-DCMAKE_BUILD_TYPE=Release",
                         "-DCLANG_ENABLE_ARCMT=OFF",
                         "-DLLDB_ENABLE_PYTHON=TRUE",
                         "-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'],
                     checks = ['check-cross-project'],
                     extra_configure_args=[
                         "-DCMAKE_C_COMPILER=gcc",
                         "-DCMAKE_CXX_COMPILER=g++",
                         "-DCMAKE_BUILD_TYPE=Release",
                         "-DCLANG_ENABLE_ARCMT=OFF",
                         "-DLLDB_ENABLE_PYTHON=TRUE",
                         "-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'],
                     extra_configure_args=[
                         "-DCMAKE_C_COMPILER=gcc",
                         "-DCMAKE_CXX_COMPILER=g++",
                         "-DCMAKE_BUILD_TYPE=Release",
                         "-DCLANG_ENABLE_CLANGD=OFF",

buildbot/osuosl/master/config/workers.py

return [
                       notify_on_missing='[e-mail]'),
 
         # Ubuntu x86_64
         create_worker("thinlto-x86-64-bot1", properties={'jobs': 64}, max_builds=1),
         create_worker("thinlto-x86-64-bot2", properties={'jobs': 64}, max_builds=1),
 
         # 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),
 
         # XCore target, Ubuntu 20.04 x64 host
         create_worker("xcore-ubuntu20-x64", properties={'jobs': 4}, max_builds=1),
 
         # ARC Worker, CentOS 7.9 x86_64 Intel Xeon Platinum 8000 @ 3.6GHz, 32GB RAM