[zorg] r354309 - Generalize getLLDBWindowsCMakeBuildFactory as getLLDBCMakeBuildFactory
Jan Kratochvil via llvm-commits
llvm-commits at lists.llvm.org
Tue Feb 19 01:25:42 PST 2019
Author: jankratochvil
Date: Tue Feb 19 01:25:41 2019
New Revision: 354309
URL: http://llvm.org/viewvc/llvm-project?rev=354309&view=rev
Log:
Generalize getLLDBWindowsCMakeBuildFactory as getLLDBCMakeBuildFactory
Also rename lldb-x86_64-fedora-28-cmake as lldb-x86_64-fedora.
Differential Revision: https://reviews.llvm.org/D54386
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
zorg/trunk/zorg/buildbot/builders/LLDBBuilder.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=354309&r1=354308&r2=354309&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Feb 19 01:25:41 2019
@@ -940,12 +940,18 @@ def _get_lldb_builders():
{'name': "lldb-x86-windows-msvc2015",
'slavenames': ["zturner-win2008"],
'builddir': "lldb-windows-x86",
- 'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(test=False)},
+ 'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
+ test=False,
+ python_source_dir=r'C:/Python35',
+ vs=r"""%VS140COMNTOOLS%""")},
# Disable the builder till we fix the cmake configuration
#{'name': "lldb-x86-win7-msvc",
#'slavenames': ["hexagon-build-01"],
#'builddir': "builddir/lldb-win7-msvc",
- #'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(config='Debug')},
+ #'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
+ # config='Debug',
+ # python_source_dir=r'C:/Python35',
+ # vs=r"""%VS140COMNTOOLS%""")},
{'name': "lldb-x86_64-ubuntu-14.04-buildserver",
'slavenames': ["lldb-linux-android-buildserver"],
'builddir': "lldb-android-buildserver",
@@ -978,20 +984,20 @@ def _get_lldb_builders():
'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
downloadBinary=False,
runTest=False)},
- {'name': "lldb-x86_64-fedora-28-cmake",
- 'slavenames': ["lldb-x86_64-fedora-28-cmake"],
- 'builddir': "lldb-x86_64-fedora-28-cmake",
+ {'name': "lldb-x86_64-fedora",
+ 'slavenames': ["lldb-x86_64-fedora"],
+ 'builddir': "lldb-x86_64-fedora",
'category' : 'lldb',
- 'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
- downloadBinary=False,
- runTest=True,
- extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=True",
- "-DLLVM_USE_LINKER=gold"])},
+ 'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
+ clean=True,
+ test=True,
+ extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=True',
+ '-DLLVM_USE_LINKER=gold'])},
{'name': "lldb-x64-windows-ninja",
'slavenames': ["win-py3-buildbot"],
'builddir': "lldb-x64-windows-ninja",
'category' : 'lldb',
- 'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(
+ 'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
clean=True,
python_source_dir=r'"C:\Program Files (x86)\Microsoft Visual Studio\Shared\Python36_64"',
target_arch='x64',
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=354309&r1=354308&r2=354309&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Tue Feb 19 01:25:41 2019
@@ -266,8 +266,8 @@ def get_build_slaves():
# OpenBSD amd64
create_slave("openbsd-amd64", properties={'jobs': 2}, max_builds=1),
- # test only: Fedora 28 x86_64, Intel Xeon E5-2630v3, 32 HT cores, 64GB RAM
- create_slave("lldb-x86_64-fedora-28-cmake", properties={'jobs': 16}, max_builds=1),
+ # test only: Fedora latest stable x86_64, Intel i5-2500, 4 cores, 12GB RAM
+ create_slave("lldb-x86_64-fedora", properties={'jobs': 4}, max_builds=1),
# Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU @ 2.30GHz
#create_slave("llgo-builder", properties={'jobs': 2}, 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=354309&r1=354308&r2=354309&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/status.py Tue Feb 19 01:25:41 2019
@@ -272,4 +272,12 @@ def get_status_targets(standard_builders
mode = "failing",
builders = ["fuchsia-x86_64-linux"],
addLogs=False),
+ InformativeMailNotifier(
+ fromaddr = "llvm.buildmaster at lab.llvm.org",
+ sendToInterestedUsers = True,
+ extraRecipients = ["jan.kratochvil at redhat.com"],
+ subject="Build %(builder)s Failure",
+ mode = "failing",
+ builders = ["lldb-x86_64-fedora"],
+ addLogs=False),
]
Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=354309&r1=354308&r2=354309&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Tue Feb 19 01:25:41 2019
@@ -45,17 +45,17 @@ def cleanSVNSourceTree(f, srcdir='llvm')
workdir='%s' % srcdir))
return f
-# CMake Windows builds
-def getLLDBWindowsCMakeBuildFactory(
+# CMake builds
+def getLLDBCMakeBuildFactory(
clean=False,
cmake='cmake',
jobs="%(jobs)s",
# Source directory containing a built python
- python_source_dir=r'C:/Python35',
+ python_source_dir=None,
# Default values for VS devenv and build configuration
- vs=r"""%VS140COMNTOOLS%""",
+ vs=None,
config='Release',
target_arch='x86',
@@ -67,9 +67,10 @@ def getLLDBWindowsCMakeBuildFactory(
f = buildbot.process.factory.BuildFactory()
# Determine Slave Environment and Set MSVC environment.
- f.addStep(SetProperty(
- command=getVisualStudioEnvironment(vs, target_arch),
- extract_fn=extractSlaveEnvironment))
+ if vs:
+ f.addStep(SetProperty(
+ command=getVisualStudioEnvironment(vs, target_arch),
+ extract_fn=extractSlaveEnvironment))
f = getLLDBSource(f,'llvm')
@@ -104,9 +105,10 @@ def getLLDBWindowsCMakeBuildFactory(
cmake_cmd = [
"cmake", "-G", "Ninja", "../llvm",
"-DCMAKE_BUILD_TYPE=" + config,
- "-DPYTHON_HOME=" + python_source_dir,
"-DCMAKE_INSTALL_PREFIX=../install"
]
+ if python_source_dir:
+ cmake_cmd.append("-DPYTHON_HOME=" + python_source_dir)
if extra_cmake_args:
cmake_cmd += extra_cmake_args
# Note: ShellCommand does not pass the params with special symbols right.
More information about the llvm-commits
mailing list