Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test worker instead of slave #44

Merged
merged 2 commits into from
Jun 27, 2016
Merged

test worker instead of slave #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e869b58
test worker instead of slave
Jun 27, 2016
253c721
Merge branch 'master' into master
tardyp Jun 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions builders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ def mksimplefactory(test_master=True):
# use workdir instead of testpath because setuptools sticks its own eggs (including
# the running version of buildbot) into sys.path *before* PYTHONPATH, but includes
# "." in sys.path even before the eggs
Trial(workdir="build/slave", testpath=".",
tests='buildslave.test',
Trial(workdir="build/worker", testpath=".",
tests='buildbot_worker.test',
usePTY=False,
name='test slave'),
name='test worker'),
])
if test_master:
f.addStep(
Expand Down Expand Up @@ -150,7 +150,7 @@ def mktestfactory(twisted_version='twisted', python_version='python',

virtualenv_packages = [twisted_version, sqlalchemy_version,
sqlalchemy_migrate_version, 'multiprocessing==2.6.2.1', 'mock==0.8.0',
'--editable=slave'] + extra_packages
'--editable=worker'] + extra_packages
if python_version > 'python2.5':
# because some of the dependencies don't work on 2.5
virtualenv_packages.extend(['moto==0.3.1', 'boto==2.29.1'])
Expand Down Expand Up @@ -204,11 +204,11 @@ def mktestfactory(twisted_version='twisted', python_version='python',
])
else:
f.addSteps([
Trial(workdir="build/slave", testpath='.',
tests='buildslave.test',
Trial(workdir="build/worker", testpath='.',
tests='buildbot_worker.test',
trial="../%(ve)s/bin/trial" % subs,
usePTY=False,
name='test slave'),
name='test worker'),
])
if not slave_only and not db:
f.addSteps([
Expand All @@ -226,13 +226,13 @@ def mkcoveragefactory():
f.addSteps([
gitStep,
VirtualenvSetup(name='virtualenv setup',
virtualenv_packages=['coverage', 'mock', '--editable=master', '--editable=slave'],
virtualenv_packages=['coverage', 'mock', '--editable=master', '--editable=worker'],
virtualenv_dir='sandbox',
haltOnFailure=True),
ShellCommand(usePTY=False, command=textwrap.dedent("""
PYTHON=sandbox/bin/python;
sandbox/bin/coverage run --rcfile=common/coveragerc \
sandbox/bin/trial buildbot.test buildslave.test \
sandbox/bin/trial buildbot.test buildbot_worker.test \
|| exit 1;
sandbox/bin/coverage html -i --rcfile=.coveragerc \
-d /home/buildbot/www/buildbot.buildbot.net/static/coverage \
Expand All @@ -255,7 +255,7 @@ def mkdocsfactory():
# run docs tools in their own virtualenv, otherwise we end up documenting
# the version of Buildbot running the metabuildbot!
VirtualenvSetup(name='virtualenv setup',
virtualenv_packages=['sphinx==1.2.2', 'Pygments==2.0.1', '--editable=master[docs]', '--editable=slave'],
virtualenv_packages=['sphinx==1.2.2', 'Pygments==2.0.1', '--editable=master[docs]', '--editable=worker'],
virtualenv_dir='sandbox',
haltOnFailure=True),

Expand All @@ -278,14 +278,14 @@ def mklintyfactory():
# run linty tools in their own virtualenv, so we can control the version
# the version of Buildbot running the metabuildbot!
VirtualenvSetup(name='virtualenv setup',
virtualenv_packages=['flake8', 'pep8==1.5.7', 'pylint==1.1.0', '--editable=master', '--editable=slave'],
virtualenv_packages=['flake8', 'pep8==1.5.7', 'pylint==1.1.0', '--editable=master', '--editable=worker'],
virtualenv_dir='../sandbox',
haltOnFailure=True),

ShellCommand(command="../sandbox/bin/pylint --rcfile common/pylintrc buildbot", name="pylint - master", flunkOnFailure=True),
ShellCommand(command="../sandbox/bin/pylint --rcfile common/pylintrc buildslave", name="pylint - slave", flunkOnFailure=True),
ShellCommand(command="../sandbox/bin/pylint --rcfile common/pylintrc buildbot_worker", name="pylint - worker", flunkOnFailure=True),
ShellCommand(command="../sandbox/bin/flake8 --config common/flake8rc master/buildbot", name="flake8 - master", flunkOnFailure=True),
ShellCommand(command="../sandbox/bin/flake8 --config common/flake8rc slave/buildslave", name="flake8 - slave", flunkOnFailure=True),
ShellCommand(command="../sandbox/bin/flake8 --config common/flake8rc worker/buildbot_worker", name="flake8 - worker", flunkOnFailure=True),
ShellCommand(command="../sandbox/bin/flake8 --config common/flake8rc www/*/setup.py www/*/buildbot_*/", name="flake8 - www", flunkOnFailure=True),
])
return f
Expand All @@ -312,7 +312,7 @@ def mkbuildsfactory():

for name, workdir, command in [
('buildbot', 'build/master', 'sdist'),
('buildbot-slave', 'build/slave', 'sdist'),
('buildbot-worker', 'build/worker', 'sdist'),
('buildbot-pkg', 'build/pkg', 'sdist'),
('buildbot-www', 'build/www/base', 'bdist_wheel'),
('buildbot-console-view', 'build/www/console_view', 'bdist_wheel'),
Expand Down