[llvm-commits] [zorg] r141841 - in /zorg/trunk/buildbot/osuosl/master: config/builders.py config/slaves.py config/status.py master.cfg
Galina Kistanova
gkistanova at gmail.com
Wed Oct 12 17:20:39 PDT 2011
Author: gkistanova
Date: Wed Oct 12 19:20:39 2011
New Revision: 141841
URL: http://llvm.org/viewvc/llvm-project?rev=141841&view=rev
Log:
Few changes to work with lab.llvm.org master buildbot v 0.8.5; cosmetic changes
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/buildbot/osuosl/master/master.cfg
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=141841&r1=141840&r2=141841&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Oct 12 19:20:39 2011
@@ -702,43 +702,43 @@
'haltOnFailure' : True },]),
'category' : 'llvm-gcc' },
- {'name' : "llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float",
- 'slavenames': [ "kistanova5" ],
- 'builddir' : "llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float",
- 'factory' : ScriptedBuilder.getScriptedBuildFactory(
- source_code = [SVN(name='svn-llvm',
- mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
- defaultBranch='trunk',
- workdir="llvm.src"),
- SVN(name='svn-llvm-gcc',
- mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm-gcc-4.2/',
- defaultBranch='trunk',
- workdir="llvm-gcc.src"),],
- launcher = 'llvm-gcc.src/extras/buildbot-launcher',
- build_script = 'llvm-gcc.src/extras/llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float',
- extra_args = [],
- build_steps = [{'name' : 'clean',
- 'description' : 'clean',
- 'haltOnFailure' : True },
- {'name' : 'copy_cross_tools',
- 'description' : 'copy cross-tools',
- 'haltOnFailure' : True },
- {'name' : 'configure_llvm',
- 'description' : 'configure llvm',
- 'haltOnFailure' : True },
- {'name' : 'make_llvm',
- 'description' : 'make llvm',
- 'haltOnFailure' : True },
- {'name' : 'configure_llvmgcc',
- 'description' : 'configure llvm-gcc',
- 'haltOnFailure' : True },
- {'name' : 'make_llvmgcc',
- 'description' : 'make llvm-gcc',
- 'haltOnFailure' : True },
- {'name' : 'install_llvmgcc',
- 'description' : 'install llvm-gcc',
- 'haltOnFailure' : True },]),
- 'category' : 'llvm-gcc' },
+# {'name' : "llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float",
+# 'slavenames': [ "kistanova5" ],
+# 'builddir' : "llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float",
+# 'factory' : ScriptedBuilder.getScriptedBuildFactory(
+# source_code = [SVN(name='svn-llvm',
+# mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
+# defaultBranch='trunk',
+# workdir="llvm.src"),
+# SVN(name='svn-llvm-gcc',
+# mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm-gcc-4.2/',
+# defaultBranch='trunk',
+# workdir="llvm-gcc.src"),],
+# launcher = 'llvm-gcc.src/extras/buildbot-launcher',
+# build_script = 'llvm-gcc.src/extras/llvm-gcc-mingw32-cross-arm-linux-gnueabi-hard-float',
+# extra_args = [],
+# build_steps = [{'name' : 'clean',
+# 'description' : 'clean',
+# 'haltOnFailure' : True },
+# {'name' : 'copy_cross_tools',
+# 'description' : 'copy cross-tools',
+# 'haltOnFailure' : True },
+# {'name' : 'configure_llvm',
+# 'description' : 'configure llvm',
+# 'haltOnFailure' : True },
+# {'name' : 'make_llvm',
+# 'description' : 'make llvm',
+# 'haltOnFailure' : True },
+# {'name' : 'configure_llvmgcc',
+# 'description' : 'configure llvm-gcc',
+# 'haltOnFailure' : True },
+# {'name' : 'make_llvmgcc',
+# 'description' : 'make llvm-gcc',
+# 'haltOnFailure' : True },
+# {'name' : 'install_llvmgcc',
+# 'description' : 'install llvm-gcc',
+# 'haltOnFailure' : True },]),
+# 'category' : 'llvm-gcc' },
{'name' : "clang-i686-linux-selfhost-rel",
'slavenames' : ["osu8"],
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=141841&r1=141840&r2=141841&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Wed Oct 12 19:20:39 2011
@@ -1,4 +1,5 @@
import buildbot
+import buildbot.buildslave
import os
import config
@@ -168,8 +169,8 @@
# Pentium Dual CPU T3400 @ 2.1GHz
create_slave("dumitrescu1", properties={'jobs' : 2}, max_builds=1),
- # AMD Athlon(tm) 64 X2 Dual Core 3800+, Ubuntu x86_64
- create_slave("grosser1", properties={'jobs': 2}, max_builds=1),
+ # AMD Athlon(tm) 64 X2 Dual Core 3800+, Ubuntu x86_64
+ create_slave("grosser1", properties={'jobs': 2}, max_builds=1),
# Defunct.
#create_slave("osu2", properties={'jobs' : 4}, max_builds=2),
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=141841&r1=141840&r2=141841&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/status.py Wed Oct 12 19:20:39 2011
@@ -8,25 +8,45 @@
from zorg.buildbot.util.ConfigEmailLookup import ConfigEmailLookup
from zorg.buildbot.util.InformativeMailNotifier import InformativeMailNotifier
+# Returns a list of Status Targets. The results of each build will be
+# pushed to these targets. buildbot/status/*.py has a variety to choose from,
+# including web pages, email senders, and IRC bots.
+
def get_status_targets(standard_builders):
+
+ from buildbot.status import html
+ from buildbot.status.web import auth, authz
+ authz_cfg=authz.Authz(
+ # change any of these to True to enable; see the manual for more
+ # options
+ gracefulShutdown = False,
+ forceBuild = True, # use this to test your slave once it is set up
+ forceAllBuilds = False,
+ pingBuilder = True,
+ stopBuild = True,
+ stopAllBuilds = False,
+ cancelPendingBuild = True,
+ )
+
default_email = config.options.get('Master Options', 'default_email')
+
return [
buildbot.status.html.WebStatus(
- http_port = 8011, allowForce = True),
- buildbot.status.mail.MailNotifier(
- fromaddr = "buildbot at google1.osuosl.org",
- extraRecipients = [default_email],
- lookup = ConfigEmailLookup(os.path.join(os.path.dirname(__file__),
- "llvmauthors.cfg"),
- default_email),
- mode = "problem",
- builders = standard_builders),
+ http_port = 8011, authz=authz_cfg),
+# buildbot.status.mail.MailNotifier(
+# fromaddr = "buildbot at lab.llvm.org",
+# extraRecipients = [default_email],
+# lookup = ConfigEmailLookup(os.path.join(os.path.dirname(__file__),
+# "llvmauthors.cfg"),
+# default_email),
+# mode = "problem",
+# builders = standard_builders),
buildbot.status.words.IRC(
host = "irc.oftc.net", nick = "llvmbb", channels = ["#llvm"],
allowForce = True,
notify_events = ['successToFailure', 'failureToSuccess']),
InformativeMailNotifier(
- fromaddr = "buildbot at google1.osuosl.org",
+ fromaddr = "buildbot at lab.llvm.org",
sendToInterestedUsers= False,
extraRecipients = ["baldrick at free.fr", "gkistanova at gmail.com"],
subject="Build %(builder)s Failure",
@@ -35,7 +55,7 @@
addLogs=False,
num_lines = 15),
InformativeMailNotifier(
- fromaddr = "buildbot at google1.osuosl.org",
+ fromaddr = "buildbot at lab.llvm.org",
sendToInterestedUsers= False,
extraRecipients = ["tobias at grosser.es"],
subject="Build %(builder)s Failure",
Modified: zorg/trunk/buildbot/osuosl/master/master.cfg
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/master.cfg?rev=141841&r1=141840&r2=141841&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Wed Oct 12 19:20:39 2011
@@ -24,8 +24,6 @@
reload(config.status)
reload(config)
-import config
-
####### BUILDSLAVES
c['slaves'] = config.slaves.get_build_slaves()
@@ -92,32 +90,10 @@
####### PROJECT IDENTITY
-c['projectName'] = "llvm"
-c['projectURL'] = "http://llvm.org/"
-c['buildbotURL'] = "http://google1.osuosl.org:8011/"
-
-####### DEBUGGING OPTIONS
-
-# If you set 'debugPassword', then you can connect to the buildmaster
-# with the diagnostic tool in contrib/debugclient.py . From this tool,
-# you can manually force builds and inject changes, which may be
-# useful for testing your buildmaster without actually commiting
-# changes to your repository (or before you have a functioning
-# 'sources' set up). The debug tool uses the same port number as the
-# slaves do: 'slavePortnum'.
-c['debugPassword'] = config.options.get('Master Options', 'debug_password')
-
-# If you set 'manhole', you can ssh into the buildmaster and get an
-# interactive python shell, which may be useful for debugging buildbot
-# internals. It is probably only useful for buildbot developers. You
-# can also use an authorized_keys file, or plain telnet.
-if config.options.getboolean('Master Options', 'enable_manhole'):
- from buildbot import manhole
- c['manhole'] = manhole.PasswordManhole(config.options.get('Master Options', 'manhole_port'),
- config.options.get('Master Options', 'manhole_user'),
- config.options.get('Master Options', 'manhole_password'))
-
-# from buildbot.scheduler import Try_Userpass
-# s = Try_Userpass("try", ["llvm-x86_64-linux"], port=8032,
-# userpass=[("llvmpatch","patchtest")] )
-# c['schedulers'].append(s)
+c['title'] = "LLVM"
+c['titleURL'] = "http://llvm.org/"
+c['buildbotURL'] = "http://lab.llvm.org:8011/"
+
+####### DB URL
+
+c['db_url'] = "sqlite:///state.sqlite"
More information about the llvm-commits
mailing list