<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">Hi Cédric,<br>
<br>
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. <br>
<br>
The push operations to the OpenStack repositories are a different
story.<br>
<br>
Ondrej<br>
<br>
<i>On 10/27/2014 03:22 PM, ZZelle wrote:</i><i><br>
</i></div>
<blockquote
cite="mid:CAMS-DWh4=6s+fZaMHkoNvxrAdJsGYKLdxR_=hNDA5LSTC2Cupg@mail.gmail.com"
type="cite">
<div dir="ltr">
<div>Hi Ondrej,<br>
<br>
</div>
<div>Could you clarify your needs?<br>
<br>
</div>
<div>If you allow your devs to commit code on your local gerrit,
<br>
then your repo will differ from OpenStack one <br>
and you might have merge troubles when you will resync your
repo with OpenStack one<br>
</div>
<div>How will you handle them?<br>
<br>
<br>
</div>
<div>Cédric/ZZelle<br>
</div>
<div><br>
</div>
<div><br>
</div>
<div><br>
</div>
<div>
<div><br>
</div>
</div>
</div>
<div class="gmail_extra"><br>
<div class="gmail_quote">On Mon, Oct 27, 2014 at 12:24 PM,
Ondrej Wisniewski <span dir="ltr"><<a
moz-do-not-send="true"
href="mailto:ondrej.wisniewski@dektech.com.au"
target="_blank">ondrej.wisniewski@dektech.com.au</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">
<div text="#000000" bgcolor="#FFFFFF">
<div>Hi Riccardo<br>
<br>
thanks for pointers you provided. I had a look at the
Gerrit replication feature and the description says:<br>
"<i>Gerrit can automatically push any changes it makes
to its managed Git repositories to another system.</i>"<br>
<br>
What I need would be exactly the opposite. I need to
update the Gerrit managed Git repository with the
upstream community Git repository.<br>
How would I go about that?<br>
<br>
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.<br>
<br>
Thanks, Ondrej
<div>
<div class="h5"><br>
<br>
On 10/24/2014 06:56 PM, Ricardo Carrillo Cruz wrote:<br>
</div>
</div>
</div>
<div>
<div class="h5">
<blockquote type="cite">
<div dir="ltr">Hi Ondrej
<div><br>
</div>
<div>The replication between Gerrit and git
mirrors is done by the Gerrit replication
mechanism.</div>
<div><br>
</div>
<div>If you look at this line in the gerrit
manifest:</div>
<div><br>
</div>
<div><a moz-do-not-send="true"
href="http://git.openstack.org/cgit/openstack-infra/system-config/tree/modules/gerrit/manifests/init.pp#n255"
target="_blank">http://git.openstack.org/cgit/openstack-infra/system-config/tree/modules/gerrit/manifests/init.pp#n255</a><br>
</div>
<div><br>
</div>
<div>you will see that it deploys a
'replication.config' file based on template:</div>
<div><br>
</div>
<div><a moz-do-not-send="true"
href="http://git.openstack.org/cgit/openstack-infra/system-config/tree/modules/gerrit/templates/replication.config.erb"
target="_blank">http://git.openstack.org/cgit/openstack-infra/system-config/tree/modules/gerrit/templates/replication.config.erb</a><br>
</div>
<div><br>
</div>
<div>You can find more information about how
Gerrit replication works here:</div>
<div><br>
</div>
<div><a moz-do-not-send="true"
href="http://gerrit.googlecode.com/svn/documentation/2.0/config-replication.html"
target="_blank">http://gerrit.googlecode.com/svn/documentation/2.0/config-replication.html</a><br>
</div>
<div><br>
</div>
<div>HTH</div>
<div><br>
</div>
<div>Regards</div>
</div>
<div class="gmail_extra"><br>
<div class="gmail_quote">2014-10-24 18:25
GMT+02:00 Ondrej Wisniewski <span dir="ltr"><<a
moz-do-not-send="true"
href="mailto:ondrej.wisniewski@dektech.com.au"
target="_blank">ondrej.wisniewski@dektech.com.au</a>></span>:<br>
<blockquote class="gmail_quote" style="margin:0
0 0 .8ex;border-left:1px #ccc
solid;padding-left:1ex">
<div text="#000000" bgcolor="#FFFFFF"> <font
face="Helvetica, Arial, sans-serif">Hi,<br>
<br>
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. <br>
<br>
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. <br>
<br>
So to cut a long story short, here are my
questions:<br>
How is the synchronization of the
OpenStack community Git repositories and
the Gerrit server done? <br>
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) ?<br>
<br>
I would be really appreciate if someone
could shed some light on this.<br>
Thanks, Ondrej<br>
</font> </div>
</blockquote>
</div>
</div>
</blockquote>
</div>
</div>
</div>
<br>
_______________________________________________<br>
OpenStack-dev mailing list<br>
<a moz-do-not-send="true"
href="mailto:OpenStack-dev@lists.openstack.org">OpenStack-dev@lists.openstack.org</a><br>
<a moz-do-not-send="true"
href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev"
target="_blank">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev</a><br>
<br>
</blockquote>
</div>
<br>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
OpenStack-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:OpenStack-dev@lists.openstack.org">OpenStack-dev@lists.openstack.org</a>
<a class="moz-txt-link-freetext" href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev</a>
</pre>
</blockquote>
<br>
</body>
</html>