[zorg] r354820 - [netbsd] Update project list, rename and move to toolchain category

[Michal Gorny via llvm-commits]

Author: mgorny
Date: Mon Feb 25 12:58:01 2019
New Revision: 354820

URL: http://llvm.org/viewvc/llvm-project?rev=354820&view=rev
Log:
[netbsd] Update project list, rename and move to toolchain category

The netbsd builder builds more LLVM projects than the previous
LLVM+Clang+LLDB assumption.  Update the project dependencies to ensure
correct blame.  Also rename it and move to toolchain group to avoid
people wrongly assuming their change couldn't affect bot with 'lldb'
in its name.

Differential Revision: https://reviews.llvm.org/D58505

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.py
    zorg/trunk/buildbot/osuosl/master/config/status.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=354820&r1=354819&r2=354820&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Feb 25 12:58:01 2019
@@ -970,13 +970,6 @@ def _get_lldb_builders():
                     buildAndroid=False,
                     runTest=True,
                     extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON'])},
-        {'name': "lldb-amd64-ninja-netbsd8",
-         'slavenames': ["lldb-amd64-ninja-netbsd8"],
-         'builddir': "netbsd8",
-         'category' : 'lldb',
-         'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
-                    downloadBinary=False,
-                    runTest=True)},
         {'name': "lldb-amd64-ninja-freebsd11",
          'slavenames': ["lldb-amd64-ninja-freebsd11"],
          'builddir': "scratch",
@@ -1545,6 +1538,26 @@ def _get_toolchain_builders():
            'builddir': "fuchsia-x86_64-linux",
            'factory': FuchsiaBuilder.getToolchainBuildFactory(),
            'category': 'fuchsia'},
+          {'name': "netbsd-amd64",
+           'slavenames': ["netbsd-amd64"],
+           'builddir': "netbsd8",
+           'category' : 'netbsd',
+           'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
+                      downloadBinary=False,
+                      runTest=True,
+                      depends_on_projects=[
+                          "cfe",
+                          "clang-tools-extra",
+                          "compiler-rt",
+                          "libcxx",
+                          "libcxxabi",
+                          "libunwind",
+                          "lld",
+                          "lldb",
+                          "llvm",
+                          "openmp",
+                          "polly",
+                      ])},
         ]
 
 # Experimental and stopped builders

Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=354820&r1=354819&r2=354820&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Mon Feb 25 12:58:01 2019
@@ -223,8 +223,8 @@ def get_build_slaves():
         # Ubuntu 16.04.3 LTS x86_64-scei-ps4, 2 x Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz
         create_slave("ps4-buildslave4"),
 
-        # NetBSD 8.x amd64
-        create_slave("lldb-amd64-ninja-netbsd8", properties={'jobs': 8}, max_builds=1),
+        # NetBSD amd64
+        create_slave("netbsd-amd64", properties={'jobs': 8}, max_builds=1),
         # FreeBSD 11.0-CURRENT amd64
         create_slave("lldb-amd64-ninja-freebsd11", properties={'jobs': 3}, max_builds=1),
 

Modified: zorg/trunk/buildbot/osuosl/master/config/status.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/status.py?rev=354820&r1=354819&r2=354820&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/status.py Mon Feb 25 12:58:01 2019
@@ -233,8 +233,7 @@ def get_status_targets(standard_builders
             extraRecipients = ["n54 at gmx.com", "mgorny at NetBSD.org"],
             subject="Build %(builder)s Failure",
             mode = "failing",
-            builders = ["lldb-amd64-ninja-netbsd7",
-                        "lldb-amd64-ninja-netbsd8"],
+            builders = ["netbsd-amd64"],
             addLogs=False,
             num_lines = 15),
         InformativeMailNotifier(