Ottomata has submitted this change and it was merged.
Change subject: Remove hooks-bugzilla configuration
......................................................................
Remove hooks-bugzilla configuration
The hooks-bugzilla plugin is no longer in use.
We only keep the bugzilla commentlink around to linkify bugzilla
references and as its-phabricator-from-bugzilla currently uses this
commentlink to hook into gerrit.
Change-Id: I83457c374ee8499f6b53182430f9a33d6636333c
---
M modules/gerrit/files/its/action.config
D modules/gerrit/files/its/templates/DraftPublished.vm
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
4 files changed, 1 insertion(+), 36 deletions(-)
Approvals:
Chad: Looks good to me, but someone else must approve
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/gerrit/files/its/action.config
b/modules/gerrit/files/its/action.config
index a7031ab..90f6c9f 100644
--- a/modules/gerrit/files/its/action.config
+++ b/modules/gerrit/files/its/action.config
@@ -5,22 +5,6 @@
association = subject,footer-Bug,footer-bug
action = add-standard-comment
-[rule "patchSetCreated"]
- event-type = patchset-created
- status = !,DRAFT
- is-draft = !,true
- association = added@subject,added@footer-Bug,added@footer-bug
- its-name = its-bugzilla
- action = add-standard-comment
- action = status PATCH_TO_REVIEW
-
-[rule "changeDraftPublished"]
- event-type = draft-published
- association = subject,footer-Bug,footer-bug
- its-name = its-bugzilla
- action = add-velocity-comment DraftPublished
- action = status PATCH_TO_REVIEW
-
[rule "patchSetCreatedPhabricator"]
event-type = patchset-created
status = !,DRAFT
diff --git a/modules/gerrit/files/its/templates/DraftPublished.vm
b/modules/gerrit/files/its/templates/DraftPublished.vm
deleted file mode 100644
index f3821d1..0000000
--- a/modules/gerrit/files/its/templates/DraftPublished.vm
+++ /dev/null
@@ -1,4 +0,0 @@
-Change $change-number had a related patch set (by $author-name) published:
-$subject
-
-${its.formatLink($change-url)}
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index d5f2c64..491bca1 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -153,11 +153,7 @@
}
file { '/var/lib/gerrit2/review_site/etc/its/templates/DraftPublished.vm':
- source => 'puppet:///modules/gerrit/its/templates/DraftPublished.vm',
- owner => 'gerrit2',
- group => 'gerrit2',
- mode => '0755',
- require => File['/var/lib/gerrit2/review_site/etc/its/templates'],
+ ensure => absent,
}
file {
'/var/lib/gerrit2/review_site/etc/its/templates/DraftPublishedPhabricator.vm':
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index d5d27f8..4a8dd2b 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -78,7 +78,6 @@
[commentlink "bugzilla"]
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
@@ -142,16 +141,6 @@
[changeMerge]
test = true
checkFrequency = 0
-[bugzilla]
- url = https://bugzilla.wikimedia.org
- username = [email protected]
- commentOnChangeAbandoned = false
- commentOnChangeMerged = false
- commentOnChangeRestored = false
- commentOnChangeCreated = false
- commentOnCommentAdded = false
- commentOnPatchSetCreated = false
- commentOnRefUpdatedGitWeb = false
[its-phabricator]
url = https://phabricator.wikimedia.org/
username = gerritbot
--
To view, visit https://gerrit.wikimedia.org/r/176265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83457c374ee8499f6b53182430f9a33d6636333c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
