929685 - Move Bugzilla source repository from Bazaar (bzr) to git

Status: RESOLVED FIXED

(Bugzilla :: Bugzilla-General, enhancement, P3)

Description

[Dave Miller [:justdave]]

Last time we did this: bug 470570

Discussion https://groups.google.com/forum/#!topic/mozilla.dev.apps.bugzilla/VkMOOQx3oYs

(although Google Group's threading order sucks)

Comment 1

[Frédéric Buclin]

We should still mirror to bzr for existing 4.x installations. It's a pain to move to another VCS just to do an update on the same branch.

Comment 2

[Dave Miller [:justdave]]

There was a new thread started on the mailing list with an update at:
https://groups.google.com/forum/#!topic/mozilla.dev.apps.bugzilla/wbVdPQmAL2c

Comment 3

[Mark Côté [:mcote]]

Plan, including rationale, is at https://wiki.mozilla.org/Bugzilla:Migrating_to_git

For the record, no serious reservations have been raised in the list, though there is some debate about how long the (read-only, mirrored-from-git) bzr repos should stay around.  That can be addressed at a later date.

Comment 4

[Gervase Markham [:gerv]]

When we do this, we should document how we did it. There are people (and I am one) who are maintaining Bugzilla installations with customizations for other people. They may want to move their repos to git too.

Gerv

Comment 5

[Mark Côté [:mcote]]

Pretty much the entire procedure is documented in the README.md for the migration scripts: https://github.com/markrcote/bugzilla-git-migration/blob/master/README.md

Comment 6

[Dave Miller [:justdave]]

I was just discussing the git->bzr mirror script and I guess there's been some concern about an ldap account for commit rights that would be doing the commits to bzr.  A better idea might be to just run the mirror script ON the bzr server, and let it commit locally, then it won't need an ldap account or ssh keys or anything.

Comment 7

[Mark Côté [:mcote]]

Can this be done?  I was just about to file a bug for a new account, but this sounds way better, if possible.

Comment 8

[Kendall Libby [:fubar] (he/him)]

Seems reasonable. The git-to-bzr script will need to commit locally instead of using bzr.m.o. I'll also have to get git installed on bzr2; the rpm conflicts with our openssh-lpk-clients package.

Comment 9

[Mark Côté [:mcote]]

Sure, simple to update the script.  I originally tested it locally, in fact.  Let me know when you get git set up (or if you aren't able to, in which case we'll go back to creating a new account).

Comment 10

[Kendall Libby [:fubar] (he/him)]

It's working, after not too much yak shaving.

bzr2.dmz.scl3# git log -1
commit 415dddf4d1c783e366dbc7b1954ccd1e2074748a
Author: Mark Côté <[e-mail]>
Date:   Tue Feb 18 12:36:23 2014 -0500

    Fixed git repo in mirroring script.

Comment 11

[Mark Côté [:mcote]]

Okay script updated.  You now need to provide source and destination repo paths/URLs as well as source and destination branches.  I'm not sure of the paths on bzr.m.o, but something like

perl git-to-bzr.pl --from-repo=https://git.mozilla.org/bugzilla/bugzilla.git --from-branch=migration_test --to-repo=/path/to/bzr/bugzilla --to-branch=migration_test

Comment 12

[Kendall Libby [:fubar] (he/him)]

bzr2.dmz.scl3# perl git-to-bzr.pl -v --from-repo=https://git.mozilla.org/bugzilla/bugzilla.git --from-branch=migration_test --to-repo=/var/www/html/bzr.mozilla.org/bugzilla/ --to-branch=migration_test
bzr checkout -q /var/www/html/bzr.mozilla.org/bugzilla/migration_test /tmp/ZA9uGgDONA
git ls-remote https://git.mozilla.org/bugzilla/bugzilla.git migration_test
Everything is up to date!

Comment 13

[Mark Côté [:mcote]]

Awesome! I think we should do a few manual tests this morning and then set it up in a cron job.

Comment 14

[Mark Côté [:mcote]]

As discussed, I just pushed an update to the mirroring script that just uses a simple "bzr cat" to view the current .gitrev instead of doing a whole checkout; the checkout is now done only if the ID in .gitrev doesn't match the ID of the latest git commit.  The result is a very fast operation if there are no changes, which will be the case the vast majority of the time.

I pushed a couple more little commits to the git migration_test branch.  fubar, please update the script, give it a run, and if the commits show up on bzr, feel free to enable the cron job again.

Comment 15

[Kendall Libby [:fubar] (he/him)]

Looks like it did the right thing. Re-enabled cron job.

Comment 16

[Mark Côté [:mcote]]

Success!  Migration completed around 16:30 EDT on 2014-03-11.  Mirror script working.  First change:


http://git.mozilla.org/?p=bugzilla/bugzilla.git;a=commit;h=d51abfd7e3e1fcc3eea37e72ab0f49f3e28950a2 [github]

mirrored to

http://bzr.mozilla.org/bugzilla/trunk/revision/8957