consider trivial rebase hook for gerrit

[James E. Blair]

bhall would like us to consider this hook:

https://www.codeaurora.org/xwiki/bin/QAEP/Gerrit

[Monty Taylor (mordred)]

This feature landed upstream in 2.4.

[Monty Taylor (mordred)]

Nope. I suck. The feature that's in 2.4 is a rebase button. This is different... this is the "carry reviews over if the change was a trivial rebase"

[Jeremy Stanley (fungi)]

I'm in the process of testing this hook on a private gerrit VM and will see about getting it into review-dev.o.o for validation shortly.

[Jeremy Stanley (fungi)]

It looks like the version linked there hasn't been touched since 2010, but a descendant is being maintained in the contrib directory of Google's Gerrit source repository. The current version adds a --port option so that the SSH port is no longer hard-coded to 29418, and incorporates a minor SQL query change we'll need to cope with more recent Gerrit database schema circa 2.2.2.1. For further details, see:

https://gerrit.googlesource.com/gerrit/+log/master/contrib/trivial_rebase.py

[Jeremy Stanley (fungi)]

Barring unforseen objections, this is slated to go into production on Monday, 2012-09-10.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/12373
Committed: http://github.com/openstack/openstack-ci-puppet/commit/f041eb4e40cff2b1d3bdd85e815aa20bb93de125
Submitter: Jenkins
Branch: master

commit f041eb4e40cff2b1d3bdd85e815aa20bb93de125
Author: Jeremy Stanley <email address hidden>
Date: Wed Sep 5 17:17:53 2012 +0000

    Gerrit Trivial Rebase Detection

    Adds trivial_rebase.py for bug 881184.

    * modules/openstack_project/files/gerrit/scripts/trivial_rebase.py: A
    modified version of the contrib/trivial_rebase.py included in upstream
    Gerrit's git tree (we'll try to get individual patches submitted
    upstream soon):

        git clone https://gerrit.googlesource.com/gerrit

    * modules/openstack_project/files/gerrit/patchset-created: Moved to
    modules/openstack_project/templates/gerrit_patchset-created.erb and
    added an entry for the trivial_rebase.py script with variables for its
    command-line options sourced from gerrit.pp and review{,_dev}.pp.

    * modules/openstack_project/manifests/gerrit.pp: Changed the file
    definition for /home/gerrit2/review_site/hooks/patchset-created to use a
    template, adding the ssh_host_key and trivial_rebase_role_id variables
    it requires. Added a file entry for trivial_rebase.py as well, since
    we're putting it in modules/openstack_project instead of modules/gerrit
    where the existing scripts reside (we'll eventually want to move all of
    modules/gerrit/files/scripts out of there at some point, but not now).

    * modules/openstack_project/manifests/review_dev.pp: Override the
    trivial_rebase_role_id variable to <email address hidden> on
    review-dev.

    * modules/openstack_project/manifests/review.pp: Override the
    trivial_rebase_role_id variable to <email address hidden> on review.

    Change-Id: I941f15525c72b84708ae1de6832834eb53ab6863