6b7d540833
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 trivial-rebase@review-dev.o.o on review-dev. * modules/openstack_project/manifests/review.pp: Override the trivial_rebase_role_id variable to trivial-rebase@review.o.o on review. Change-Id: I941f15525c72b84708ae1de6832834eb53ab6863 Reviewed-on: https://review.openstack.org/12373 Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Reviewed-by: James E. Blair <corvus@inaugust.com> Approved: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins |
||
---|---|---|
.. | ||
backup_server.pp | ||
bare_slave.pp | ||
base.pp | ||
community.pp | ||
dashboard.pp | ||
eavesdrop.pp | ||
etherpad.pp | ||
gerrit.pp | ||
glancetest.pp | ||
init.pp | ||
jenkins_dev.pp | ||
jenkins.pp | ||
lists.pp | ||
paste.pp | ||
planet.pp | ||
puppet_cron.pp | ||
puppetmaster.pp | ||
pypi.pp | ||
review_dev.pp | ||
review.pp | ||
server.pp | ||
slave_template.pp | ||
slave.pp | ||
static.pp | ||
template.pp | ||
users.pp | ||
wiki.pp | ||
zuul.pp |