ArielGlenn has submitted this change and it was merged.
Change subject: Move IRC bots from #mediawiki to #wikimedia-dev
......................................................................
Move IRC bots from #mediawiki to #wikimedia-dev
This change moves two IRC bots from #mediawiki to #wikimedia-dev: 'wikibugs',
which announces activity on Bugzilla, and 'gerrit-wm', which announces Gerrit
activity in relevant projects. The rationale for the move is that #mediawiki is
a support channel, and that users looking for support are liable to find the
rapid clip of bot activity disorienting.
Depends on: Ic18d7117a.
Bug: 46144
Bug: 46282
Bug: 46322
Change-Id: I10a02bfeb7859e44e295aba4f13633a2327d6cfd
---
M files/gerrit/hooks/hookhelper.py
M files/gerrit/hooks/hookhelper_test.py
M manifests/gerrit.pp
M manifests/misc/wikibugs.pp
M templates/gerrit/hookconfig.py.erb
5 files changed, 10 insertions(+), 11 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/gerrit/hooks/hookhelper.py b/files/gerrit/hooks/hookhelper.py
index bdcd033..a5a17a2 100644
--- a/files/gerrit/hooks/hookhelper.py
+++ b/files/gerrit/hooks/hookhelper.py
@@ -100,6 +100,6 @@
if branch in hookconfig.filenames[foundproject]:
filename = hookconfig.filenames[foundproject][branch]
else:
- # Direct assignement such as 'default': 'mediawiki.log'
+ # Direct assignement such as 'default': 'wikimedia-dev.log'
filename = hookconfig.filenames[foundproject]
return hookconfig.logdir + "/" + filename
diff --git a/files/gerrit/hooks/hookhelper_test.py
b/files/gerrit/hooks/hookhelper_test.py
index d9fd812..ecefbf6 100644
--- a/files/gerrit/hooks/hookhelper_test.py
+++ b/files/gerrit/hooks/hookhelper_test.py
@@ -104,8 +104,8 @@
'mediawiki/core',
'Wikidata'
)
- # Make sure mediawiki/core.git@master is still sent to #mediawiki
- self.assertLogFile('mediawiki.log',
+ # Make sure mediawiki/core.git@master is sent to #wikimedia-dev
+ self.assertLogFile('wikimedia-dev.log',
'mediawiki/core',
'master'
)
@@ -116,8 +116,8 @@
self.assertLogFile('wikimedia-dev.log',
'mediawiki/tools/upload/PhotoUpload')
- def test_catchall_to_mediawiki(self):
- self.assertLogFile('mediawiki.log',
+ def test_catchall_to_wikimediadev(self):
+ self.assertLogFile('wikimedia-dev.log',
'department/project')
def test_qa_to_wikimediadev(self):
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 9816ea3..5bc6a09 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -342,9 +342,8 @@
"${ircecho_logbase}/mobile.log" =>
"#wikimedia-mobile",
"${ircecho_logbase}/parsoid.log" =>
"#mediawiki-parsoid",
"${ircecho_logbase}/visualeditor.log" =>
"#mediawiki-visualeditor",
- "${ircecho_logbase}/mediawiki.log" =>
"#mediawiki",
"${ircecho_logbase}/wikimedia-dev.log" =>
"#wikimedia-dev",
- "${ircecho_logbase}/semantic-mediawiki.log" =>
["#semantic-mediawiki", "#mediawiki"],
+ "${ircecho_logbase}/semantic-mediawiki.log" =>
["#semantic-mediawiki", "#wikimedia-dev"],
"${ircecho_logbase}/wikidata.log" =>
"#wikimedia-wikidata",
"${ircecho_logbase}/wikimedia-analytics.log" =>
"#wikimedia-analytics",
}
diff --git a/manifests/misc/wikibugs.pp b/manifests/misc/wikibugs.pp
index b75d122..3f573c3 100644
--- a/manifests/misc/wikibugs.pp
+++ b/manifests/misc/wikibugs.pp
@@ -23,7 +23,7 @@
$ircecho_logs = {
"${ircecho_logbase}/wikimedia-labs.log" =>
"#wikimedia-labs",
"${ircecho_logbase}/wikimedia-mobile.log" =>
"#wikimedia-mobile",
- "${ircecho_logbase}/mediawiki.log" =>
"#mediawiki-feed",
+ "${ircecho_logbase}/wikimedia-dev.log" =>
"#wikimedia-dev",
}
$ircecho_nick = "wikibugs"
$ircecho_server = 'chat.freenode.net'
diff --git a/templates/gerrit/hookconfig.py.erb
b/templates/gerrit/hookconfig.py.erb
index af8aa55..210e299 100644
--- a/templates/gerrit/hookconfig.py.erb
+++ b/templates/gerrit/hookconfig.py.erb
@@ -22,7 +22,7 @@
"mediawiki/core": {
"Wikidata" : "wikidata.log",
# Explicitly define a default, hookhelper does not fallback
properly
- "default" : "mediawiki.log",
+ "default" : "wikimedia-dev.log",
},
# WMF projects
@@ -33,7 +33,7 @@
"analytics/*" : "wikimedia-analytics.log",
"integration/*" : "wikimedia-dev.log",
"labs/*" : "labs.log",
- "mediawiki/*" : "mediawiki.log",
+ "mediawiki/*" : "wikimedia-dev.log",
"mediawiki/tools/*" : "wikimedia-dev.log",
"operations/*": "operations.log",
"qa/*": "wikimedia-dev.log",
@@ -56,7 +56,7 @@
# See also bug 46917
"test/gerrit-ping" : "ignored.log",
- "default": "mediawiki.log"
+ "default": "wikimedia-dev.log"
}
# These users are annoying since they're bots and such. Don't report their
comments...
--
To view, visit https://gerrit.wikimedia.org/r/57752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10a02bfeb7859e44e295aba4f13633a2327d6cfd
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: AzaToth <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: MZMcBride <[email protected]>
Gerrit-Reviewer: Matmarex <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Peachey88 <[email protected]>
Gerrit-Reviewer: RobLa <[email protected]>
Gerrit-Reviewer: Thehelpfulone <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
