Buildbot tweaks.

- Legacy-Id: 14476
This commit is contained in:
buildbot 2017-12-30 09:18:23 +00:00
parent 099ba8922e
commit 5cf87e0a83

View file

@ -20,6 +20,7 @@ c['slaves'] = [
BuildSlave("datatracker_lin_py27_3", datatracker_lin_py27_3_pw), BuildSlave("datatracker_lin_py27_3", datatracker_lin_py27_3_pw),
BuildSlave("datatracker_osx_py27_4", datatracker_osx_py27_4_pw), BuildSlave("datatracker_osx_py27_4", datatracker_osx_py27_4_pw),
BuildSlave("datatracker_lin_py27_5", datatracker_lin_py27_5_pw), BuildSlave("datatracker_lin_py27_5", datatracker_lin_py27_5_pw),
BuildSlave("datatracker_lin_py27_6", datatracker_lin_py27_6_pw),
] ]
# 'protocols' contains information about protocols which master will use for # 'protocols' contains information about protocols which master will use for
@ -55,7 +56,7 @@ c['change_source'] = [
from buildbot.schedulers.basic import SingleBranchScheduler, AnyBranchScheduler from buildbot.schedulers.basic import SingleBranchScheduler, AnyBranchScheduler
from buildbot.schedulers.forcesched import ForceScheduler from buildbot.schedulers.forcesched import ForceScheduler
from buildbot.schedulers.timed import Nightly, NightlyTriggerable from buildbot.schedulers.timed import Nightly
from buildbot.changes import filter from buildbot.changes import filter
c['schedulers'] = [ c['schedulers'] = [
# Branch schedulers # Branch schedulers
@ -77,12 +78,10 @@ c['schedulers'] = [
change_filter=filter.ChangeFilter(branch_re='personal/.*')), change_filter=filter.ChangeFilter(branch_re='personal/.*')),
AnyBranchScheduler(name="lin_test_personal",treeStableTimer=60*5, builderNames=["[personal] Test Suite"], AnyBranchScheduler(name="lin_test_personal",treeStableTimer=60*5, builderNames=["[personal] Test Suite"],
change_filter=filter.ChangeFilter(branch_re='personal/.*')), change_filter=filter.ChangeFilter(branch_re='personal/.*')),
AnyBranchScheduler(name="osx_test_personal",treeStableTimer=60*5, builderNames=["[personal] Test Suite (OS X)"],
change_filter=filter.ChangeFilter(branch_re='personal/.*')),
# Periodic Schedulers # Periodic Schedulers
Nightly(name="lin_test_old_libs", hour=16, minute=12, branch="trunk", builderNames=["Verify Minimum Libs"],), Nightly(name="lin_test_old_libs", hour=16, minute=12, branch="trunk", builderNames=["Verify Minimum Libs"],),
Nightly(name="lin_test_libs", hour=16, minute=42, branch="trunk", builderNames=["Verify Latest Libs"],), Nightly(name="lin_test_libs", hour=16, minute=42, branch="trunk", builderNames=["Verify Latest Libs"],),
Nightly(name="crawler", hour=[5,7,9,11,13,15,17], minute=00, branch="trunk", onlyIfChanged=True, builderNames=["Test-Crawler"],), Nightly(name="crawler", hour=[8,9,10,11,12,13,14,15,16,17], minute=00, branch="trunk", onlyIfChanged=True, builderNames=["Test-Crawler"],),
# Force schedulers # Force schedulers
ForceScheduler(name="force_pyflakes", builderNames=["Check PyFlakes"]), ForceScheduler(name="force_pyflakes", builderNames=["Check PyFlakes"]),
@ -96,7 +95,6 @@ c['schedulers'] = [
# #
ForceScheduler(name="force_pyflakes_personal", builderNames=["[personal] Check PyFlakes"]), ForceScheduler(name="force_pyflakes_personal", builderNames=["[personal] Check PyFlakes"]),
ForceScheduler(name="force_lin_test_personal", builderNames=["[personal] Test Suite"]), ForceScheduler(name="force_lin_test_personal", builderNames=["[personal] Test Suite"]),
ForceScheduler(name="force_osx_test_personal", builderNames=["[personal] Test Suite (OS X)"]),
] ]
####### BUILDERS ####### BUILDERS
@ -125,8 +123,8 @@ class TestCrawlerShellCommand(WarningCountingShellCommand):
command=["bin/test-crawl"] command=["bin/test-crawl"]
warningPatterns = { warningPatterns = {
"exceptions": "^Traceback", "exceptions": "^(Traceback| File| |.*Error|.*Exception)",
"failed": " FAIL", "failed": " FAIL ",
"warnings": " WARN", "warnings": " WARN",
"slow": " SLOW", "slow": " SLOW",
"invalid_html": " invalid html:", "invalid_html": " invalid html:",
@ -308,12 +306,6 @@ factory.addStep(SVN(
repourl=Interpolate('https://svn.tools.ietf.org/svn/tools/ietfdb/%(src::branch:~trunk)s'), repourl=Interpolate('https://svn.tools.ietf.org/svn/tools/ietfdb/%(src::branch:~trunk)s'),
descriptionSuffix=[Interpolate('%(src::branch)s %(src::revision)s')], descriptionSuffix=[Interpolate('%(src::branch)s %(src::revision)s')],
)) ))
factory.addStep(ShellCommand(
descriptionDone="install requirements",
workdir=Interpolate('build/%(src::branch)s'),
haltOnFailure=True,
command=["pip", "install", "-r", "requirements.txt"],
))
factory.addStep(ShellCommand( factory.addStep(ShellCommand(
descriptionDone="seting up settings_local.py", descriptionDone="seting up settings_local.py",
workdir=Interpolate('build/%(src::branch)s'), workdir=Interpolate('build/%(src::branch)s'),
@ -334,11 +326,11 @@ factory.addStep(ShellCommand(
)) ))
c['builders'].append(BuilderConfig(name="Check PyFlakes", factory=factory, category="1. trunk", c['builders'].append(BuilderConfig(name="Check PyFlakes", factory=factory, category="1. trunk",
slavenames=["datatracker_lin_py27_1", "datatracker_lin_py27_2", "datatracker_lin_py27_3"])) slavenames=["datatracker_lin_py27_1", ]))
c['builders'].append(BuilderConfig(name="[branch] Check PyFlakes", factory=factory, category="2. branch", c['builders'].append(BuilderConfig(name="[branch] Check PyFlakes", factory=factory, category="2. branch",
slavenames=["datatracker_lin_py27_1", "datatracker_lin_py27_2", "datatracker_lin_py27_3"])) slavenames=["datatracker_lin_py27_2", ]))
c['builders'].append(BuilderConfig(name="[personal] Check PyFlakes", factory=factory, category="3. personal", c['builders'].append(BuilderConfig(name="[personal] Check PyFlakes", factory=factory, category="3. personal",
slavenames=["datatracker_lin_py27_1", "datatracker_lin_py27_2", "datatracker_lin_py27_3"])) slavenames=["datatracker_lin_py27_3", ]))
# -*- section Builder_TestSuite -*- # -*- section Builder_TestSuite -*-
@ -390,12 +382,12 @@ factory.addStep(ShellCommand(
"propset", "--revprop", "-r", Property('got_revision'), "test:unittest", "passed" ], "propset", "--revprop", "-r", Property('got_revision'), "test:unittest", "passed" ],
)) ))
c['builders'].append(BuilderConfig(name="[branch] Test Suite", factory=factory, category="2. branch",
slavenames=["datatracker_lin_py27_1", "datatracker_lin_py27_2", "datatracker_lin_py27_3"]))
c['builders'].append(BuilderConfig(name="[personal] Test Suite", factory=factory, category="3. personal",
slavenames=["datatracker_lin_py27_1", "datatracker_lin_py27_2", "datatracker_lin_py27_3"]))
c['builders'].append(BuilderConfig(name="Test Suite", factory=factory, category="1. trunk", c['builders'].append(BuilderConfig(name="Test Suite", factory=factory, category="1. trunk",
slavenames=["datatracker_lin_py27_1", "datatracker_lin_py27_2", "datatracker_lin_py27_3"])) slavenames=["datatracker_lin_py27_1", ]))
c['builders'].append(BuilderConfig(name="[branch] Test Suite", factory=factory, category="2. branch",
slavenames=["datatracker_lin_py27_2", ]))
c['builders'].append(BuilderConfig(name="[personal] Test Suite", factory=factory, category="3. personal",
slavenames=["datatracker_lin_py27_3", ]))
# -*- section Builder_TestSuiteOSX -*- # -*- section Builder_TestSuiteOSX -*-
@ -445,8 +437,6 @@ c['builders'].append(BuilderConfig(name="Test Suite (OS X)", factory=factory, ca
slavenames=["datatracker_osx_py27_4"])) slavenames=["datatracker_osx_py27_4"]))
c['builders'].append(BuilderConfig(name="[branch] Test Suite (OS X)", factory=factory, category="2. branch", c['builders'].append(BuilderConfig(name="[branch] Test Suite (OS X)", factory=factory, category="2. branch",
slavenames=["datatracker_osx_py27_4"])) slavenames=["datatracker_osx_py27_4"]))
c['builders'].append(BuilderConfig(name="[personal] Test Suite (OS X)", factory=factory, category="3. personal",
slavenames=["datatracker_osx_py27_4"]))
# -*- section Builder_TestCrawler -*- # -*- section Builder_TestCrawler -*-
@ -493,7 +483,7 @@ factory.addStep(ShellCommand(
)) ))
c['builders'].append(BuilderConfig(name="Test-Crawler", factory=factory, category="1. trunk", c['builders'].append(BuilderConfig(name="Test-Crawler", factory=factory, category="1. trunk",
slavenames=["datatracker_lin_py27_1", ])) slavenames=["datatracker_lin_py27_6", ]))
# -*- section Builder_Verify_Old_Libs -*- # -*- section Builder_Verify_Old_Libs -*-