[openstack-dev] [Infra][all] Synchronizing local Git and Gerrit repositories

Ondrej Wisniewski ondrej.wisniewski at dektech.com.au
Mon Oct 27 15:48:02 UTC 2014


Hi Cédric,

I have basically two internal OpenStack mirrors (bare Git repositories). 
One is to share code contributions among the dev team members, the other 
is handled by Gerrit and this is where the devs send code for review. 
Both should be updated periodically from the upstream servers. While 
this works fine for the first one doing "git remote update", it doesn't 
seem to be that easy for the Gerrit repositories.

The push operations to the OpenStack repositories are a different story.

Ondrej

/On 10/27/2014 03:22 PM, ZZelle wrote://
/
> Hi Ondrej,
>
> Could you clarify your needs?
>
> If you allow your devs to commit code on your local gerrit,
> then your repo will differ from OpenStack one
> and you might have merge troubles when you will resync your repo with 
> OpenStack one
> How will you handle them?
>
>
> Cédric/ZZelle
>
>
>
>
>
> On Mon, Oct 27, 2014 at 12:24 PM, Ondrej Wisniewski 
> <ondrej.wisniewski at dektech.com.au 
> <mailto:ondrej.wisniewski at dektech.com.au>> wrote:
>
>     Hi Riccardo
>
>     thanks for pointers you provided. I had a look at the Gerrit
>     replication feature and the description says:
>     "/Gerrit can automatically push any changes it makes to its
>     managed Git repositories to another system./"
>
>     What I need would be exactly the opposite. I need to update the
>     Gerrit managed Git repository with the upstream community Git
>     repository.
>     How would I go about that?
>
>     What I tried was defining the community repository as remote
>     origin and then do "git remote update". This updates the remote
>     references but doesn't update the local branches.
>
>     Thanks, Ondrej
>
>
>     On 10/24/2014 06:56 PM, Ricardo Carrillo Cruz wrote:
>>     Hi Ondrej
>>
>>     The replication between Gerrit and git mirrors is done by the
>>     Gerrit replication mechanism.
>>
>>     If you look at this line in the gerrit manifest:
>>
>>     http://git.openstack.org/cgit/openstack-infra/system-config/tree/modules/gerrit/manifests/init.pp#n255
>>
>>     you will see that it deploys a 'replication.config' file based on
>>     template:
>>
>>     http://git.openstack.org/cgit/openstack-infra/system-config/tree/modules/gerrit/templates/replication.config.erb
>>
>>     You can find more information about how Gerrit replication works
>>     here:
>>
>>     http://gerrit.googlecode.com/svn/documentation/2.0/config-replication.html
>>
>>     HTH
>>
>>     Regards
>>
>>     2014-10-24 18:25 GMT+02:00 Ondrej Wisniewski
>>     <ondrej.wisniewski at dektech.com.au
>>     <mailto:ondrej.wisniewski at dektech.com.au>>:
>>
>>         Hi,
>>
>>         I am trying to set up an OpenStack development workflow in
>>         our company. We have an internal Git repository mirror of all
>>         OpenStack projects we are working on. It is periodically
>>         updated from the upstream OpenStack community servers. This
>>         is used to share the code among developers.
>>
>>         Furthermore I have set up a Gerrit server for the internal
>>         code review. The Gerrit server also works with repository
>>         mirrors of the community repositories which should be updated
>>         periodically. Or at least that's the idea. I ran into lots of
>>         problems and couldn't find a good way of synchronizing the
>>         developer mirrors with the Gerrit repositories.
>>
>>         So to cut a long story short, here are my questions:
>>         How is the synchronization of the OpenStack community Git
>>         repositories and the Gerrit server done?
>>         How can I import an OpenStack project into my Gerrit system
>>         from my local Git mirror and keep both synchronized (at least
>>         the master branch) ?
>>
>>         I would be really appreciate if someone could shed some light
>>         on this.
>>         Thanks, Ondrej
>>
>
>     _______________________________________________
>     OpenStack-dev mailing list
>     OpenStack-dev at lists.openstack.org
>     <mailto:OpenStack-dev at lists.openstack.org>
>     http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>
>
>
>
> _______________________________________________
> OpenStack-dev mailing list
> OpenStack-dev at lists.openstack.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-dev/attachments/20141027/c731ed53/attachment.html>


More information about the OpenStack-dev mailing list