Skip to content

Commit 08ddacc

Browse files
author
buildbot
committed
Changed the command to list installed packages from 'pip list' to 'pip freeze', in order to be able to use the list as input to 'pip install -r'. Changed the NightlyTriggerable test-crawler run back to Nightly, but with a list of hours designed to avoid the test-database load time at ~04:20.
- Legacy-Id: 12113
1 parent 06c10ff commit 08ddacc

1 file changed

Lines changed: 3 additions & 14 deletions

File tree

buildbot/masters/datatracker/master.cfg

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ c['schedulers'] = [
8282
# Periodic Schedulers
8383
Nightly(name="lin_test_old_libs", hour=16, minute=12, branch="trunk", builderNames=["Verify Minimum Libs"],),
8484
Nightly(name="lin_test_libs", hour=16, minute=42, branch="trunk", builderNames=["Verify Latest Libs"],),
85-
NightlyTriggerable(name="crawler", hour=[5,7,9,11,13,15,17], minute=00, builderNames=["Test-Crawler"],),
85+
Nightly(name="crawler", hour=[5,7,9,11,13,15,17], minute=00, branch="trunk", onlyIfChanged=True, builderNames=["Test-Crawler"],),
8686

8787
# Force schedulers
8888
ForceScheduler(name="force_pyflakes", builderNames=["Check PyFlakes"]),
@@ -111,7 +111,6 @@ from buildbot.steps.source.svn import SVN
111111
from buildbot.steps.shell import ShellCommand, WarningCountingShellCommand
112112
from buildbot.steps.python import PyFlakes
113113
from buildbot.steps.python_twisted import RemovePYCs
114-
from buildbot.steps.trigger import Trigger
115114
#
116115
from buildbot.process.properties import Property, Interpolate
117116
from buildbot.config import BuilderConfig
@@ -189,7 +188,6 @@ class TestCrawlerShellCommand(WarningCountingShellCommand):
189188

190189
# If there were any warnings, make the log if lines with warnings
191190
# available
192-
log = syslog.syslog
193191
for key in warnings:
194192
if len(warnings[key]) > 0:
195193
self.addCompleteLog("%s (%d)" % (key, len(warnings[key])),
@@ -396,15 +394,6 @@ c['builders'].append(BuilderConfig(name="[branch] Test Suite", factory=factory,
396394
slavenames=["datatracker_lin_py27_1", "datatracker_lin_py27_2", "datatracker_lin_py27_3"]))
397395
c['builders'].append(BuilderConfig(name="[personal] Test Suite", factory=factory, category="3. personal",
398396
slavenames=["datatracker_lin_py27_1", "datatracker_lin_py27_2", "datatracker_lin_py27_3"]))
399-
400-
# For the trunk tests suite only, add a trigger to the test crawler
401-
# to the steps above
402-
factory.addStep(Trigger(schedulerNames=['crawler'],
403-
waitForFinish=False,
404-
alwaysUseLatest=True,
405-
set_properties={},
406-
))
407-
408397
c['builders'].append(BuilderConfig(name="Test Suite", factory=factory, category="1. trunk",
409398
slavenames=["datatracker_lin_py27_1", "datatracker_lin_py27_2", "datatracker_lin_py27_3"]))
410399

@@ -555,7 +544,7 @@ factory.addStep(ShellCommand(
555544
descriptionDone="list installed pyton modules",
556545
workdir=Interpolate('build/%(src::branch)s'),
557546
haltOnFailure=True,
558-
command=["pip", "list"],
547+
command=["pip", "freeze"],
559548
))
560549
factory.addStep(ShellCommand(
561550
descriptionDone="collect static files",
@@ -608,7 +597,7 @@ factory.addStep(ShellCommand(
608597
descriptionDone="list installed pyton modules",
609598
workdir=Interpolate('build/%(src::branch)s'),
610599
haltOnFailure=True,
611-
command=["pip", "list"],
600+
command=["pip", "freeze"],
612601
))
613602
factory.addStep(ShellCommand(
614603
descriptionDone="collect static files",

0 commit comments

Comments
 (0)