Ottomata has submitted this change and it was merged.
Change subject: Drop 'Phabricator' suffix from gerrit's ITS actions
......................................................................
Drop 'Phabricator' suffix from gerrit's ITS actions
It's only Phabricator right now. No more bugzilla. So we can now skip
the Phabricator suffix.
Change-Id: I0ace692a6e5d6f469bb8459f6d47439af264f3ce
---
M modules/gerrit/files/its/action.config
R modules/gerrit/files/its/templates/DraftPublished.vm
R modules/gerrit/files/its/templates/PatchSetCreated.vm
M modules/gerrit/manifests/jetty.pp
4 files changed, 19 insertions(+), 15 deletions(-)
Approvals:
Chad: Looks good to me, but someone else must approve
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/gerrit/files/its/action.config
b/modules/gerrit/files/its/action.config
index 90f6c9f..6f663eb 100644
--- a/modules/gerrit/files/its/action.config
+++ b/modules/gerrit/files/its/action.config
@@ -5,16 +5,16 @@
association = subject,footer-Bug,footer-bug
action = add-standard-comment
-[rule "patchSetCreatedPhabricator"]
+[rule "patchSetCreated"]
event-type = patchset-created
status = !,DRAFT
is-draft = !,true
association = added@subject,added@footer-Bug,added@footer-bug
its-name = its-phabricator
- action = add-velocity-comment PatchSetCreatedPhabricator
+ action = add-velocity-comment PatchSetCreated
-[rule "changeDraftPublishedPhabricator"]
+[rule "changeDraftPublished"]
event-type = draft-published
association = subject,footer-Bug,footer-bug
its-name = its-phabricator
- action = add-velocity-comment DraftPublishedPhabricator
+ action = add-velocity-comment DraftPublished
diff --git a/modules/gerrit/files/its/templates/DraftPublishedPhabricator.vm
b/modules/gerrit/files/its/templates/DraftPublished.vm
similarity index 100%
rename from modules/gerrit/files/its/templates/DraftPublishedPhabricator.vm
rename to modules/gerrit/files/its/templates/DraftPublished.vm
diff --git a/modules/gerrit/files/its/templates/PatchSetCreatedPhabricator.vm
b/modules/gerrit/files/its/templates/PatchSetCreated.vm
similarity index 100%
rename from modules/gerrit/files/its/templates/PatchSetCreatedPhabricator.vm
rename to modules/gerrit/files/its/templates/PatchSetCreated.vm
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index 491bca1..4254492 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -153,23 +153,27 @@
}
file { '/var/lib/gerrit2/review_site/etc/its/templates/DraftPublished.vm':
- ensure => absent,
+ source => 'puppet:///modules/gerrit/its/templates/DraftPublished.vm',
+ owner => 'gerrit2',
+ group => 'gerrit2',
+ mode => '0755',
+ require => File['/var/lib/gerrit2/review_site/etc/its/templates'],
+ }
+
+ file { '/var/lib/gerrit2/review_site/etc/its/templates/PatchSetCreated.vm':
+ source => 'puppet:///modules/gerrit/its/templates/PatchSetCreated.vm',
+ owner => 'gerrit2',
+ group => 'gerrit2',
+ mode => '0755',
+ require => File['/var/lib/gerrit2/review_site/etc/its/templates'],
}
file {
'/var/lib/gerrit2/review_site/etc/its/templates/DraftPublishedPhabricator.vm':
- source =>
'puppet:///modules/gerrit/its/templates/DraftPublishedPhabricator.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/PatchSetCreatedPhabricator.vm':
- source =>
'puppet:///modules/gerrit/its/templates/PatchSetCreatedPhabricator.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/static/page-bkg.jpg':
--
To view, visit https://gerrit.wikimedia.org/r/176266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ace692a6e5d6f469bb8459f6d47439af264f3ce
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
