From f37452d0a210bc138d09d96ad76df5f5695f49fd Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 7 Jan 2012 12:40:47 -0800 Subject: [PATCH] Added missing steps to project import docs. Change-Id: Iecfcd8f46d29d8230bed4af59a02c68f4df7beed --- doc/gerrit.rst | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/gerrit.rst b/doc/gerrit.rst index 167ce828..1c4f715e 100644 --- a/doc/gerrit.rst +++ b/doc/gerrit.rst @@ -544,7 +544,7 @@ Pull requests can not be disabled for a project in Github, so instead we have a script that runs from cron to close any open pull requests with instructions to use Gerrit. -* Edit openstack/openstack-ci-puppet:site.pp +* Edit openstack/openstack-ci-puppet:manifests/site.pp and add the project to the list of github projects in the gerrit class for the gerrit.openstack.org node. @@ -577,6 +577,22 @@ So, for instance, to do glance, you would do: And you will then have a git repo of glance in the glance dir. This git repo is now suitable for uploading in to gerrit to become the new master repo. +Project Config +************** + +There are a few options which need to be enabled on the project in the Admin +interface. + +* Merge Strategy should be set to "Merge If Necessary" +* "Automatically resolve conflicts" should be enabled +* "Require Change-Id in commit message" should be enabled +* "Require a valid contributor agreement to upload" should be enabled + +Optionally, if the PTL agrees to it: + +* "Require the first line of the commit to be 50 characters or less" should + be enabled. + .. _acl: Access Controls