Closed Bug 494577 Opened 15 years ago Closed 15 years ago

Abstract repack factories to work with comm-central configurations

Categories

(Release Engineering :: General, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: kairo, Assigned: kairo)

References

Details

Attachments

(1 file, 5 obsolete files)

For getting ultimately a CCNightlyRepackFactory (prototyped in http://hg.mozilla.org/users/kairo_kairo.at/bbconf-sm2/file/tip/ccfactory.py right now, will move to buildbotcustom when ready) to work, we need to abstract the repack base classes in a way that they can deal with comm-central build structure, mostly the mozilla subdir.
Attached patch abstract repack factories, v1 (obsolete) (deleted) — Splinter Review
Here's the version of the patch with which I got the new SeaMonkey buildbots to work, using the subclass CCNightlyRepackFactory in http://hg.mozilla.org/users/kairo_kairo.at/bbconf-sm2/file/3e2eac32fea5/ccfactory.py#l78 The changes in this patch are: * accept a mozillaDir variable (like we did for the build factories) * it's confusing to refer to a directory with the branchName var, so assign an origSrcDir var to refer to the source directory for the original (non-localized) code * mozillaSrcDir points to the mozilla directory in the source * run autoconf in the mozillaSrcDir as well if mozillaDir is set (saves us from subclassing and is trivial) * make sure to hg clone into origSrcDir (as branchName may be different to the repo name) * use branchName instead of getRepoName() for upload (repeats logic that MozillaBuildFactory has for self.branchName but we only run its __init__ when we already have assigned self.postUploadCmd) All those changes should work fine with current mozilla2 configs as well, as every abstraction falls back to what we're doing now.
Assignee: nobody → kairo
Status: NEW → ASSIGNED
Attachment #379431 - Flags: review?(bhearsum)
Attached patch v1.1 - unbitrot after bug 478436, use -p option (obsolete) (deleted) — Splinter Review
bug 478436 slightly bitrotted the patch, and this one uses -p (I wonder why I didn't have that option in my .hgrc all along, thanks nthomas for spotting that).
Attachment #379431 - Attachment is obsolete: true
Attachment #380520 - Flags: review?(bhearsum)
Attachment #379431 - Flags: review?(bhearsum)
Comment on attachment 380520 [details] [diff] [review] v1.1 - unbitrot after bug 478436, use -p option This patch definitely doesn't work with our Buildbot, I couldn't get it to pass checkconfig: File "/tools/buildbot/lib/python2.5/site-packages/buildbot-0.7.10p1-py2.5.egg/buildbot/scripts/runner.py", line 913, in doCheckConfig ConfigLoader(configFile) File "/tools/buildbot/lib/python2.5/site-packages/buildbot-0.7.10p1-py2.5.egg/buildbot/scripts/checkconfig.py", line 31, in __init__ self.loadConfig(configFile) File "/tools/buildbot/lib/python2.5/site-packages/buildbot-0.7.10p1-py2.5.egg/buildbot/master.py", line 512, in loadConfig exec f in localDict File "master.cfg", line 1, in <module> execfile("master-main.cfg") File "master-main.cfg", line 383, in <module> clobberTime=clobberTime, File "/tools/buildbotcustom/buildbotcustom/process/factory.py", line 1178, in __init__ if kwargs['branchName']: KeyError: 'branchName' make: *** [checkconfig] Error 1
Attachment #380520 - Flags: review?(bhearsum) → review-
Attached patch fix up the check for branchName (obsolete) (deleted) — Splinter Review
Hah, I was too JS-y in the check for branchName. This patch should work better :)
Attachment #380520 - Attachment is obsolete: true
Attachment #381122 - Flags: review?(bhearsum)
Blocks: 496368
Attached patch unbitrot for recent buildbotcustom changes (obsolete) (deleted) — Splinter Review
This is the same patch as the previous, but unbitrotted to apply cleanly to current buildbotcustom (bug 496509 caused conflicts)
Attachment #381122 - Attachment is obsolete: true
Attachment #383989 - Flags: review?(bhearsum)
Attachment #381122 - Flags: review?(bhearsum)
Blocks: 498110
Blocks: 470673
Blocks: 490151
Attached patch unbitrot for buildbotcustom changes again (obsolete) (deleted) — Splinter Review
This patch is unbitrotted for Armen's changes for L10n updates.
Attachment #383989 - Attachment is obsolete: true
Attachment #385370 - Flags: review?(bhearsum)
Attachment #383989 - Flags: review?(bhearsum)
unbitrot once more, cleanly applies to buildbotcustom rev. 2c8a4ab0c551
Attachment #385370 - Attachment is obsolete: true
Attachment #387040 - Flags: review?(bhearsum)
Attachment #385370 - Flags: review?(bhearsum)
I did a mock release with this patch today and it went great. I'll do an actual review tomorrow.
Comment on attachment 387040 [details] [diff] [review] everybody do the unbitrot dance - again... This is functionally fine, I do find the 3 different Dir variables a tad confusing, though. I don't know what we can do to improve that situation, though. Coop works with this code much more than me...so I'd like him to weigh in too.
Attachment #387040 - Flags: review?(ccooper)
Attachment #387040 - Flags: review?(bhearsum)
Attachment #387040 - Flags: review+
Attachment #387040 - Flags: review?(ccooper) → review+
Comment on attachment 387040 [details] [diff] [review] everybody do the unbitrot dance - again... changeset: 362:0171716794eb
Attachment #387040 - Flags: checked‑in+
Thanks for checking in, marking fixed as the patch seems to stick.
Status: ASSIGNED → RESOLVED
Closed: 15 years ago
Resolution: --- → FIXED
Product: mozilla.org → Release Engineering
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: