From c80681bd9ab056925c0358efd4623e84ab53b4fc Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Tue, 28 Jan 2014 22:23:38 -0800
Subject: [PATCH] disable the jeepyb trivial rebase hook on review-dev.o.o
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
---
modules/openstack_project/manifests/review_dev.pp | 2 --
modules/openstack_project/templates/gerrit_patchset-created.erb | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index c960f1b800..f23f6ea3a9 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -66,8 +66,6 @@ class openstack_project::review_dev (
github_oauth_token => $github_oauth_token,
github_project_username => $github_project_username,
github_project_password => $github_project_password,
- trivial_rebase_role_id =>
- 'trivial-rebase@review-dev.openstack.org',
mysql_password => $mysql_password,
email_private_key => $email_private_key,
sysadmins => $sysadmins,
diff --git a/modules/openstack_project/templates/gerrit_patchset-created.erb b/modules/openstack_project/templates/gerrit_patchset-created.erb
index 1f35a12577..27fcab949d 100755
--- a/modules/openstack_project/templates/gerrit_patchset-created.erb
+++ b/modules/openstack_project/templates/gerrit_patchset-created.erb
@@ -4,11 +4,13 @@
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 --dryrun \
--verbose welcome-message@review.openstack.org \