Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
## Private settings

The production server uses /etc/buildbot/settings.yaml configuration file which
contains secrets like the IRC nickname password.
contains necessary secrets and other configuration.

## Update requirements

Expand Down
4 changes: 0 additions & 4 deletions master/custom/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
DEFAULTS = dict(
web_port=9011,
worker_port=9021,
irc_notice=False,
irc_host="irc.libera.chat",
irc_channel="#python-dev-notifs",
irc_nick="py-bb-test",
buildbot_url="http://localhost:9011/",
db_url="sqlite:///state.sqlite",
do_auth=False,
Expand Down
23 changes: 1 addition & 22 deletions master/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ c["www"] = dict(

# 'services' is a list of Status Targets. The results of each build will be
# pushed to these targets. buildbot/reporters/*.py has a variety to choose from,
# including web pages, email senders, and IRC bots.
# including web pages, email senders, etc.

c["services"] = []

Expand All @@ -391,27 +391,6 @@ if bool(settings.send_mail):
)
)

if bool(settings.irc_notice):
irc_args = dict(
host=str(settings.irc_host),
nick=str(settings.irc_nick),
channels=[dict(channel=str(settings.irc_channel))],
notify_events=set(
settings.get(
'irc_notify_events',
# 'cancelled' is not logged to avoid spaming IRC when
# a "pull-request-scheduler" is cancelled
['better', 'worse', 'exception']
)
),
useColors=True,
)
password = settings.get('irc_password', None)
if password:
irc_args['useSASL'] = True
irc_args['password'] = password
c["services"].append(reporters.IRC(**irc_args))

c["services"].append(
reporters.GitHubStatusPush(
str(settings.github_status_token),
Expand Down
Loading