474589 - buildbot-configs CVS -> hg migration

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Chris AtLee [:catlee]]

Currently we have these directories in CVS's buildbot-configs directory:

automation/
           production/
           production-1.9/
           staging/
           staging-1.9/
testing/
        leaktest/
        moz2unit/
        seamonkey/
        sisyphus/
        talos/
        unittest/
        unittest-stage/
tryserver/

The automation directory, as well as testing/unittest are used by the 1.8/1.9 branches.  These can stay in CVS until the 1.8/1.9 branches die.

I'd like to start off by importing talos' perf-staging and perfmaster, as well as tryserver into our mercurial buildbot-configs repository.

The simple method would be to just add the current version of the files into buildbot-configs in the relevent directories.

We can also try and preserve history by converting the CVS repo.

My current approach so far is to convert the CVS repository with 'hg convert' and a filemap to exclude certain directories.  Then pull the newly created hg repo into the existing buildbot-configs repo, and merge.

# filemap contains:
include testing/talos
include tryserver
rename testing/talos/perf-staging talos-staging
rename testing/talos/perfmaster talos

# In CVS working copy of buildbot-configs/tools
hg convert --filemap filemap buildbot-configs

# In hg working copy
hg pull -f /path/to/tools/buildbot-configs-hg
hg merge
hg commit

Comment 1

[Chris AtLee [:catlee]]

It helps to use a username mapping for the conversion:
# usermap contains:
anodelman%mozilla.com = Alice Nodelman <[e-mail]>
bclary%bclary.com = Bob Clary <[e-mail]>
bhearsum%mozilla.com = Ben Hearsum <[e-mail]>
bzbarsky%mit.edu = Boris Zbarsky <[e-mail]>
catlee%mozilla.com = Chris AtLee <[e-mail]>
ccooper%deadsquid.com = Chris Cooper <[e-mail]>
gavin%gavinsharp.com = Gavin Sharp <[e-mail]>
jwalden%mit.edu = [e-mail]
kairo%kairo.at = Robert Kaiser <[e-mail]>
karlt+%karlt.net = [e-mail]
nrthomas%gmail.com = Nick Thomas <[e-mail]>
pavlov%pavlov.net = [e-mail]
rcampbell%mozilla.com = Rob Campbell <[e-mail]>
reed%reedloden.com = Reed Loden <[e-mail]>
rhelmer%mozilla.com = Rob Helmer <[e-mail]>
ted.mielczarek%gmail.com = Ted Mielczarek <[e-mail]>

then we do
hg convert -A usermap --filemap filemap buildbot-configs

Comment 2

[Reed Loden [:reed]]

(In reply to comment #1)
> jwalden%mit.edu = [e-mail]

Jeff Walden

> karlt+%karlt.net = [e-mail]

Karl Tomlinson

> pavlov%pavlov.net = [e-mail]

Stuart Parmenter

Comment 3

[alice nodelman [:alice] [:anode]]

I have no objections to switching the talos buildbot code from cvs to hg.  Please ensure that this gets correctly set up for production, stage and try.

Comment 4

[Chris AtLee [:catlee]]

filemap is now:
include testing/talos
exclude testing/talos/baseliner
include tryserver
rename testing/talos/perf-staging talos-staging
rename testing/talos/perfmaster talos
rename testing/talos/tryperfmaster talos-try

The resulting repository can be found at:
http://hg.mozilla.org/users/catlee_mozilla.com/test/

Comment 5

[Chris AtLee [:catlee]]

CVS history was merged into mercurial this morning:

changeset:   931:9aaf9bc21d69
parent:      726:5a0a4e79714e
parent:      930:42289e9631f5
user:        Chris AtLee <[e-mail]>
date:        Mon Feb 09 08:37:56 2009 -0500
summary:     Bug 474589 - Merge in buildbot-configs from CVS. r=anodelman

Comment 6

[Chris AtLee [:catlee]]

Config files were updated on:
qm-rhel02 for perfmaster and tryperfmaster
qm-buildbot01 for perf-staging
sm-try-master and sm-staging-try-master

Comment 7

[Chris AtLee [:catlee]]

Directories were deleted from CVS on the 13th.