opendev/system-config
Code Issues Proposed changes

disable the jeepyb trivial rebase hook on review-dev.o.o

Browse Source 
This change is for the pending gerrit upgrade.  Gerrit 2.8 has built-in trivial rebase
detection[1].  This change disables the jeepyb trivial rebase hook on review-dev.o.o so
so we can use and test gerrit's built-in rebase detector instead.

[1] https://gerrit-review.googlesource.com/Documentation/config-labels.html#label_copyAllScoresOnTrivialRebase
and https://gerrit-review.googlesource.com/Documentation/config-labels.html#label_copyAllScoresIfNoCodeChange

Closes-Bug: #1273959
Partial-Bug: #1082781

Change-Id: Ia14d8ee86b9d59b6f79ee873231bb0d13b7f43d2
This commit is contained in:
Khai Do 2014-01-28 22:23:38 -08:00
parent c3811872cd
commit c80681bd9a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/review_dev.pp
View File

@ -66,8 +66,6 @@ class openstack_project::review_dev (
github_oauth_token => $github_oauth_token, github_oauth_token => $github_oauth_token,
github_project_username => $github_project_username, github_project_username => $github_project_username,
github_project_password => $github_project_password, github_project_password => $github_project_password,
trivial_rebase_role_id =>
'trivial-rebase@review-dev.openstack.org',
mysql_password => $mysql_password, mysql_password => $mysql_password,
email_private_key => $email_private_key, email_private_key => $email_private_key,
sysadmins => $sysadmins, sysadmins => $sysadmins,

2
modules/openstack_project/templates/gerrit_patchset-created.erb
View File

@ -4,11 +4,13 @@
timeout -k 2m 10m /usr/local/bin/update-blueprint patchset-created "$@" timeout -k 2m 10m /usr/local/bin/update-blueprint patchset-created "$@"
timeout -k 2m 10m /usr/local/bin/update-bug patchset-created "$@" timeout -k 2m 10m /usr/local/bin/update-bug patchset-created "$@"
timeout -k 2m 10m /usr/local/bin/notify-impact patchset-created "$@" --impact SecurityImpact --dest-address 'openstack-security@lists.openstack.org' timeout -k 2m 10m /usr/local/bin/notify-impact patchset-created "$@" --impact SecurityImpact --dest-address 'openstack-security@lists.openstack.org'
<% if trivial_rebase_role_id -%>
timeout -k 2m 10m /usr/local/bin/trivial-rebase \ timeout -k 2m 10m /usr/local/bin/trivial-rebase \
patchset-created \ patchset-created \
--whitespace \ --whitespace \
--private-key-path=<%= ssh_host_key %> \ --private-key-path=<%= ssh_host_key %> \
--role-user=<%= trivial_rebase_role_id %> "$@" --role-user=<%= trivial_rebase_role_id %> "$@"
<% end -%>
<% if $ssh_welcome_rsa_key_contents != "" -%> <% if $ssh_welcome_rsa_key_contents != "" -%>
timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created --dryrun \ timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created --dryrun \
--verbose welcome-message@review.openstack.org \ --verbose welcome-message@review.openstack.org \