Ryan Lane has submitted this change and it was merged.
Change subject: Configure hooks-bugzilla plugin for gerrit
......................................................................
Configure hooks-bugzilla plugin for gerrit
Change-Id: I4120b7b89e737aae430b1328f1edc8ecee9d5457
---
M manifests/gerrit.pp
M templates/gerrit/gerrit.config.erb
M templates/gerrit/secure.config.erb
3 files changed, 9 insertions(+), 2 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 2bd75be..94a3c57 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -28,6 +28,7 @@
$dbname = $db_name
$dbuser = $db_user
$dbpass = $passwords::gerrit::gerrit_db_pass
+ $bzpass = $passwords::gerrit::gerrit_bz_pass
# Setup LDAP
include role::ldap::config::labs
diff --git a/templates/gerrit/gerrit.config.erb
b/templates/gerrit/gerrit.config.erb
index d22ce6e..02b30cd 100644
--- a/templates/gerrit/gerrit.config.erb
+++ b/templates/gerrit/gerrit.config.erb
@@ -59,8 +59,9 @@
match = \\b([0-9a-f]{8,40})\\b
link = "#q,$1,n,z"
[commentlink "bugzilla"]
- match = "\\b([bB][uU][gG]\\:?\\s+#?)(\\d+)\\b"
- link = https://bugzilla.wikimedia.org/$2
+ match = "\\b[bB][uU][gG]\\:?\\s+#?(\\d+)\\b"
+ link = https://bugzilla.wikimedia.org/$1
+ association = OPTIONAL
[commentlink "codereview"]
match = \\br(\\d+)\\b
link = https://www.mediawiki.org/wiki/Special:CodeReview/MediaWiki/$1
@@ -101,3 +102,6 @@
[changeMerge]
test = true
checkFrequency = 0
+[bugzilla]
+ url = https://bugzilla.wikimedia.org
+ username = [email protected]
diff --git a/templates/gerrit/secure.config.erb
b/templates/gerrit/secure.config.erb
index 1690a9f..50b78dc 100644
--- a/templates/gerrit/secure.config.erb
+++ b/templates/gerrit/secure.config.erb
@@ -5,3 +5,5 @@
password = <%= ldap_proxyagent_pass %>
[auth]
registerEmailPrivateKey = <%= email_key %>
+[bugzilla]
+ password = <%= bzpass %>
--
To view, visit https://gerrit.wikimedia.org/r/50379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4120b7b89e737aae430b1328f1edc8ecee9d5457
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
