Skip to content

Commit

Permalink
nine is merged - no separate builds anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
buildbot.net admins committed Jun 17, 2014
1 parent 7ff9344 commit 18511b2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 46 deletions.
44 changes: 9 additions & 35 deletions builders.py
View file
Expand Up @@ -12,8 +12,6 @@
from metabbotcfg.slaves import slaves, get_slaves, names

builders = []
master_builders = []
nine_builders = []

# slaves seem to have a hard time fetching from github, so retry
gitStep = Git(repourl='git://github.com/buildbot/buildbot.git', mode='full', method='fresh', retryFetch=True)
Expand Down Expand Up @@ -260,18 +258,14 @@ def mkdocsfactory():

# manual
ShellCommand(command=Interpolate(textwrap.dedent("""\
case '%(src::branch)s' in
master) export VERSION=latest ;;
nine) export VERSION=nine ;;
*) exit 1 ;;
esac &&
source sandbox/bin/activate &&
make docs
""")), name="create docs"),
ShellCommand(command=textwrap.dedent("""\
export VERSION=latest &&
tar -C /home/buildbot/www/buildbot.net/buildbot/docs -zvxf master/docs/docs.tgz &&
chmod -R a+rx /home/buildbot/www/buildbot.net/buildbot/docs/{nine,latest} &&
find /home/buildbot/www/buildbot.net/buildbot/docs/{latest,nine} -name '*.html' | xargs python /home/buildbot/www/buildbot.net/buildbot/add-tracking.py
chmod -R a+rx /home/buildbot/www/buildbot.net/buildbot/docs/latest &&
find /home/buildbot/www/buildbot.net/buildbot/docs/latest -name '*.html' | xargs python /home/buildbot/www/buildbot.net/buildbot/add-tracking.py
"""), name="docs to web", flunkOnFailure=True, haltOnFailure=True),

])
Expand Down Expand Up @@ -306,23 +300,18 @@ def mklintyfactory():
'slavenames' : names(get_slaves(buildbot_net=True)),
'factory' : mkdocsfactory(),
'category' : 'docs' })
master_builders.append(builders[-1])
nine_builders.append(builders[-1])

builders.append({
'name' : 'coverage',
'slavenames' : names(get_slaves(buildbot_net=True)),
'factory' : mkcoveragefactory(),
'category' : 'docs' })
master_builders.append(builders[-1])

builders.append({
'name' : 'linty',
'slavenames' : names(get_slaves(buildbot_net=True)),
'factory' : mklintyfactory(),
'category' : 'docs' })
master_builders.append(builders[-1])
nine_builders.append(builders[-1])

#### single-slave builders

Expand All @@ -336,7 +325,6 @@ def mklintyfactory():
'slavenames' : [ sl.slavename ],
'factory' : f,
'category' : 'slave' })
master_builders.append(builders[-1])

#### operating systems

Expand All @@ -351,8 +339,6 @@ def mklintyfactory():
'slavenames' : names(get_slaves(os=opsys)),
'factory' : f,
'category' : 'os' })
master_builders.append(builders[-1])
nine_builders.append(builders[-1])

#### databases

Expand All @@ -368,18 +354,15 @@ def mklintyfactory():
'slavenames' : names(get_slaves(db=db)),
'factory' : f,
'category' : 'db' })
master_builders.append(builders[-1])
nine_builders.append(builders[-1])

#### www (nine)
#### www

f = mktestfactory(www=True)
builders.append({
'name' : 'www',
'slavenames' : names(get_slaves(nodejs=True)),
'factory' : f,
'category' : 'www' })
nine_builders.append(builders[-1])

#### config builders

Expand All @@ -392,15 +375,16 @@ def mklintyfactory():
tw1300='Twisted==14.0.0',
)

# versions of twisted only supported by slave
slave_only_twisted = ['tw0900', 'tw1020']

python_versions = dict(
py25='python2.5',
py26='python2.6',
py27='python2.7',
)

# versions of twisted and python only supported by slave
slave_only_twisted = ['tw0900', 'tw1020']
slave_only_python = ['py25']

# incompatible versions of twisted and python
incompat_tw_py = [
('tw0900', 'py27'),
Expand All @@ -419,7 +403,7 @@ def mklintyfactory():
if (tw, py) in incompat_tw_py:
continue

slave_only = tw in slave_only_twisted
slave_only = tw in slave_only_twisted or py in slave_only_python
f = mktestfactory(twisted_version=twisted_version, python_version=python_version,
slave_only=slave_only)
name = "%s-%s" % (py, tw)
Expand All @@ -428,9 +412,6 @@ def mklintyfactory():
'slavenames' : config_slaves,
'factory' : f,
'category' : 'config' })
master_builders.append(builders[-1])
if py != "py25":
nine_builders.append(builders[-1])

# py24 + tw0810 for slave only
config_slaves = names(get_slaves(run_config=True, py24=True, tw0810=True))
Expand All @@ -442,7 +423,6 @@ def mklintyfactory():
'slavenames' : config_slaves,
'factory' : f,
'category' : 'config' })
master_builders.append(builders[-1])

pypy_versions = dict(
pypy17='pypy1.7',
Expand All @@ -467,8 +447,6 @@ def mklintyfactory():
'slavenames' : config_slaves,
'factory' : f,
'category' : 'config' })
master_builders.append(builders[-1])
nine_builders.append(builders[-1])

config_slaves = names(get_slaves(run_config=True, py27=True))

Expand Down Expand Up @@ -503,8 +481,6 @@ def mklintyfactory():
'slavenames' : config_slaves,
'factory' : f,
'category' : 'config' })
master_builders.append(builders[-1])
nine_builders.append(builders[-1])

for sam, sqlalchemy_migrate_version in sqlalchemy_migrate_versions.items():
sqlalchemy_version = sqlalchemy_versions['sa094']
Expand All @@ -519,5 +495,3 @@ def mklintyfactory():
'slavenames' : config_slaves,
'factory' : f,
'category' : 'config' })
master_builders.append(builders[-1])
nine_builders.append(builders[-1])
18 changes: 7 additions & 11 deletions schedulers.py
View file
Expand Up @@ -11,22 +11,18 @@
from metabbotcfg.debian import schedulers as deb_schedulers

schedulers.append(SingleBranchScheduler(name="all", branch='master',
treeStableTimer=10,
builderNames=[ b['name'] for b in builders.master_builders ]))
treeStableTimer=2,
builderNames=[ b['name'] for b in builders.builders ]))

schedulers.append(SingleBranchScheduler(name="release", branch='buildbot-0.8.9',
treeStableTimer=10,
builderNames=[ b['name'] for b in builders.master_builders if b['name'] not in ('docs',) ]))

schedulers.append(SingleBranchScheduler(name="nine", branch='nine',
treeStableTimer=5,
builderNames=[ b['name'] for b in builders.nine_builders ]))
#schedulers.append(SingleBranchScheduler(name="release", branch='buildbot-0.8.9',
# treeStableTimer=10,
# builderNames=[ b['name'] for b in builders.builders if b['name'] not in ('docs',) ]))

schedulers.append(ForceScheduler(name="force",
repository=FixedParameter(name="repository", default='git://github.com/buildbot/buildbot.git'),
branch=ChoiceStringParameter(name="branch", default="master", choices=["master", "nine"]),
branch=ChoiceStringParameter(name="branch", default="master", choices=["master", "eight"]),
project=FixedParameter(name="project", default=""),
properties=[],
builderNames=[ b['name'] for b in builders.master_builders ]))
builderNames=[ b['name'] for b in builders.builders ]))

schedulers += deb_schedulers

0 comments on commit 18511b2

Please sign in to comment.