Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Bug 818493 - Don't enable idleizer for pandas. r=coop

--HG--
extra : rebase_source : 4f8708b1968b263fdeb126675c819eebe9e47431
  • Loading branch information...
commit 3f0774a8496596b6fc44094f39ab72599e931525 1 parent 1566a46
@Callek Callek authored
Showing with 10 additions and 1 deletion.
  1. +10 −1 lib/python/slavealloc/logic/buildbottac.py
View
11 lib/python/slavealloc/logic/buildbottac.py
@@ -45,7 +45,9 @@
s = BuildSlave(buildmaster_host, port, slavename, passwd, basedir,
keepalive, usepty, umask=umask, maxdelay=maxdelay)
s.setServiceParent(application)
+"""
+idleizer_template = """\
# enable idleizer
from buildslave import idleizer
idlz = idleizer.Idleizer(s,
@@ -74,6 +76,13 @@ def make_buildbot_tac(allocation):
info['slavename'] = allocation.slavename
info['basedir'] = allocation.slave_basedir
info['passwd'] = allocation.slave_password
- template = template_header + (allocation.template or default_template)
+ template = template_header
+ if allocation.template:
+ template += allocation.template
+ else:
+ template += default_template
+ if not 'panda-' in info['slavename']:
+ # XXX We shouldn't hardcode the 'panda-' check here
+ template += idleizer_template
return unicode(template % info).encode('utf8')
Please sign in to comment.
Something went wrong with that request. Please try again.