Merge "Remove puppet for jeepyb's trivial rebase script"

This commit is contained in:
Jenkins 2016-08-08 12:54:32 +00:00 committed by Gerrit Code Review
commit 8321635338
2 changed files with 0 additions and 8 deletions

View File

@ -54,7 +54,6 @@ class openstack_project::gerrit (
$github_oauth_token = '',
$github_project_username = '',
$github_project_password = '',
$trivial_rebase_role_id = '',
$email_private_key = '',
$token_private_key = '',
$replicate_local = true,

View File

@ -4,13 +4,6 @@
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/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 \
patchset-created \
--whitespace \
--private-key-path=<%= @ssh_host_key %> \
--role-user=<%= @trivial_rebase_role_id %> "$@"
<% end -%>
<% if @ssh_welcome_rsa_key_contents != "" -%>
timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created \
--verbose --ssh-user=welcome-message \