[zorg] r258972 - Plain LLVM builder llvm-s390x-linux1 switched to a full clang builder (clang-s390x-linux).

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Wed Jan 27 13:24:04 2016
New Revision: 258972

URL: http://llvm.org/viewvc/llvm-project?rev=258972&view=rev
Log:
Plain LLVM builder llvm-s390x-linux1 switched to a full clang builder (clang-s390x-linux).

Patch by Ulrich Weigand.

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=258972&r1=258971&r2=258972&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Jan 27 13:24:04 2016
@@ -66,10 +66,6 @@ from zorg.buildbot.builders import ABITe
 # Plain LLVM builders.
 def _get_llvm_builders():
     return [
-        {'name': "llvm-s390x-linux1",
-         'slavenames':["systemz-1"],
-         'builddir':"llvm-s390x-linux1",
-         'factory': LLVMBuilder.getLLVMBuildFactory("s390x-linux-gnu", jobs=4, clean=False, timeout=20, config_name='Release+Asserts')},
         # We currently have to force LLVM_HOST_TRIPLE and
         # LLVM_DEFAULT_TARGET_TRIPLE on this system. CMake gets the value
         # correct for the processor but it's currently not possible to emit O32
@@ -335,6 +331,15 @@ def _get_clang_builders():
          'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
                                                             useTwoStage=False,
                                                             stage1_config='Release',
+                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
+         'category' : 'clang'},
+
+        {'name': "clang-s390x-linux",
+         'slavenames':["systemz-1"],
+         'builddir':"clang-s390x-linux",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
+                                                            useTwoStage=False,
+                                                            stage1_config='Release',
                                                             extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
          'category' : 'clang'},
 

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=258972&r1=258971&r2=258972&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Wed Jan 27 13:24:04 2016
@@ -153,7 +153,7 @@ def get_build_slaves():
         # Debian 7.7 x86_64 GCE instance
         create_slave("modules-slave-1", properties={'jobs': 16}, max_builds=1),
 
-        # zEnterprise 196 (s390x), SLES 11 SP2
+        # zEnterprise 196 (s390x), SLES 12
         create_slave("systemz-1", properties={'jobs': 4}, max_builds=1),
 
         # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU E5-1650 0 @ 3.20GHz

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=258972&r1=258971&r2=258972&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/status.py Wed Jan 27 13:24:04 2016
@@ -110,7 +110,7 @@ def get_status_targets(standard_builders
             extraRecipients = ["Ulrich.Weigand at de.ibm.com"],
             subject="Build %(builder)s Failure",
             mode = "failing",
-            builders = ["llvm-s390x-linux1"],
+            builders = ["clang-s390x-linux"],
             addLogs=False,
             num_lines = 15),
         InformativeMailNotifier(