Closed Bug 728930 Opened 8 years ago Closed 8 years ago

Move SeaMonkey mozconfigs into source tree

Categories

(SeaMonkey :: Release Engineering, defect)

defect
Not set

Tracking

(seamonkey2.10 fixed)

RESOLVED FIXED
seamonkey2.11
Tracking Status
seamonkey2.10 --- fixed

People

(Reporter: Callek, Assigned: Callek)

References

Details

Attachments

(9 files, 1 obsolete file)

12.02 KB, patch
kairo
: review+
Details | Diff | Splinter Review
435.94 KB, patch
kairo
: feedback+
Details | Diff | Splinter Review
638 bytes, patch
kairo
: review+
Details | Diff | Splinter Review
6.12 KB, patch
kairo
: review+
Details | Diff | Splinter Review
34.12 KB, patch
kairo
: review+
Details | Diff | Splinter Review
6.88 KB, patch
kairo
: review+
Details | Diff | Splinter Review
2.01 KB, patch
kairo
: review+
Details | Diff | Splinter Review
564 bytes, patch
Callek
: review+
Details | Diff | Splinter Review
2.06 KB, patch
Callek
: review+
Details | Diff | Splinter Review
We should move our mozconfigs into the source tree like Firefox has done.

Will make it much clearer on when something changes, and when it has not.
the /dep/ changes are just to match the /nightly/ changes, and should be fine.

I *believe* (but will verify) that the absense of the src configs will not break any builders though.
Attachment #598930 - Flags: review?(kairo)
This is just a helper to understand *what* changes by doing this. It is a diff of the dump-master output both before and after the change.
Attachment #598936 - Flags: feedback?(kairo)
This officially switches all dep builds to use the same mozconfig as "nightly"
Attachment #598945 - Flags: review?(kairo)
Attached patch [buildbot-configs] Part 3, v1 (obsolete) — Splinter Review
This patch drops the _dep mozconfigs which are no longer used (see Part 1 for what changed in mozconfigs by doing so)
Attachment #598946 - Flags: review?(kairo)
Attachment #598946 - Attachment description: [buildbot-configs] Part 2, v1 → [buildbot-configs] Part 3, v1
This makes use of update_channel and adjust release Configs to use srcmozconfig where applicable. Currently the l10n repack code that we use does not support srcMozconfig, so that will be a separate bug though
Attachment #599016 - Flags: review?(kairo)
Slight changes here based on checkconfig catching!
Attachment #598946 - Attachment is obsolete: true
Attachment #599023 - Flags: review?(kairo)
Attachment #598946 - Flags: review?(kairo)
This is just a straight copy of the various mozconfigs from our real builds, I did not include release mozconfigs in this batch, I'll do those last (since they are not required for much of this bug)
Attachment #599292 - Flags: review?(kairo)
Comment on attachment 598930 [details] [diff] [review]
[buildbot-configs] Part 1, v1
[Checked in: Comment 18]

Not sure if it makes too much sense to patch comm-1.9.1 and comm-2.0 configs inb this patch, could just delete them...
Attachment #598930 - Flags: review?(kairo) → review+
Comment on attachment 598936 [details] [diff] [review]
dump-master output from buildbot-configs part 1

*Looks* good though I'm not really sure what dump-master is...
Attachment #598936 - Flags: feedback?(kairo) → feedback+
Attachment #598945 - Flags: review?(kairo) → review+
Attachment #599016 - Flags: review?(kairo) → review+
Comment on attachment 599023 [details] [diff] [review]
[buildbot-configs] Part 3, v1.5
[Checked in: Comment 21]

And here you are deleting the mozconfigs anyhow, so I wonder if patching them first makes too much sense, it's not like we can track them across repos anyhow.
Also, can we do this across branches yet, don't we need to check in the mozconfigs on all branches before?
Attachment #599023 - Flags: review?(kairo) → review+
Attachment #599292 - Flags: review?(kairo) → review+
Comment on attachment 599295 [details] [diff] [review]
[comm-central] Part 6, make use of MOZ_UPDATE_CHANNEL so that other trains work right
[Checked in: Comment 17 & 32]

Could do this right away, but might make sense.
Attachment #599295 - Flags: review?(kairo) → review+
(In reply to Robert Kaiser (:kairo@mozilla.com) from comment #10)
> Comment on attachment 598936 [details] [diff] [review]
> dump-master output from buildbot-configs part 1
> 
> *Looks* good though I'm not really sure what dump-master is...

dump-master is a script in the braindump repo that prints out info from all the Buidlers, steps, and schedulers etc. So that you can better assess what a config/buildbotcustom change is actually changing.

By using it you can see that in this case we switch from always wget'ing the configs from buildbot-configs we test if they are present in our source tree...

(In reply to Robert Kaiser (:kairo@mozilla.com) from comment #11)
> Comment on attachment 599023 [details] [diff] [review]
> [buildbot-configs] Part 3, v1.5
> 
> And here you are deleting the mozconfigs anyhow, so I wonder if patching
> them first makes too much sense, it's not like we can track them across
> repos anyhow.

Sure, the patching first was `mostly` just a "lets be sure we're not changing stuff that we don't expect when we switch.

> Also, can we do this across branches yet, don't we need to check in the
> mozconfigs on all branches before?

Yea, the buildbot-configs configs need to be on the |default| branch, but I merged both ways this past week, so will land on default and just merge to seamonkey-production.
Attachment #599292 - Flags: approval-comm-aurora?
Attachment #599295 - Flags: approval-comm-aurora?
Comment on attachment 599292 [details] [diff] [review]
[comm-central] Part 5, copy mozconfigs from buildbot-configs directly. (Not Release Configs yet)
[Checked in: Comment 16 & 32]

a=me for comm-aurora.

Callek says over IRC "Because they enable srcdir mozconfigs properly, such that we can enable msvc2010 soonish much much more easily"
Attachment #599292 - Flags: approval-comm-aurora? → approval-comm-aurora+
Comment on attachment 599295 [details] [diff] [review]
[comm-central] Part 6, make use of MOZ_UPDATE_CHANNEL so that other trains work right
[Checked in: Comment 17 & 32]

a=me for comm-aurora.

Callek says over IRC "Because they enable srcdir mozconfigs properly, such that we can enable msvc2010 soonish much much more easily"
Attachment #599295 - Flags: approval-comm-aurora? → approval-comm-aurora+
Comment on attachment 599292 [details] [diff] [review]
[comm-central] Part 5, copy mozconfigs from buildbot-configs directly. (Not Release Configs yet)
[Checked in: Comment 16 & 32]

http://hg.mozilla.org/comm-central/rev/6e7659bcca95
Attachment #599292 - Attachment description: [comm-central] Part 5, copy mozconfigs from buildbot-configs directly. (Not Release Configs yet) → [comm-central] Part 5, copy mozconfigs from buildbot-configs directly. (Not Release Configs yet) [Checked in: Comment 16]
Comment on attachment 599295 [details] [diff] [review]
[comm-central] Part 6, make use of MOZ_UPDATE_CHANNEL so that other trains work right
[Checked in: Comment 17 & 32]

http://hg.mozilla.org/comm-central/rev/f3aee29e61df
Attachment #599295 - Attachment description: [comm-central] Part 6, make use of MOZ_UPDATE_CHANNEL so that other trains work right. → [comm-central] Part 6, make use of MOZ_UPDATE_CHANNEL so that other trains work right [Checked in: Comment 17]
Comment on attachment 598930 [details] [diff] [review]
[buildbot-configs] Part 1, v1
[Checked in: Comment 18]

http://hg.mozilla.org/build/buildbot-configs/rev/9c7c078d58b5
Attachment #598930 - Attachment description: [buildbot-configs] Part 1, v1 → [buildbot-configs] Part 1, v1 [Checked in: Comment 18]
Comment on attachment 598945 [details] [diff] [review]
[buildbotcustom] Part 2, v1
[Checked in: Comment 19]

http://hg.mozilla.org/build/buildbotcustom/rev/7641faab0337
Attachment #598945 - Attachment description: [buildbotcustom] Part 2, v1 → [buildbotcustom] Part 2, v1 [Checked in: Comment 19]
Comment on attachment 599023 [details] [diff] [review]
[buildbot-configs] Part 3, v1.5
[Checked in: Comment 21]

http://hg.mozilla.org/build/buildbotcustom/rev/12c68b23e307
Attachment #599023 - Attachment description: [buildbot-configs] Part 3, v1.5 → [buildbot-configs] Part 3, v1.5 [Checked in: Comment 20]
Comment on attachment 599023 [details] [diff] [review]
[buildbot-configs] Part 3, v1.5
[Checked in: Comment 21]

(In reply to Serge Gautherie (:sgautherie) from comment #20)
> http://hg.mozilla.org/build/buildbotcustom/rev/12c68b23e307

http://hg.mozilla.org/build/buildbot-configs/rev/12c68b23e307 !
Attachment #599023 - Attachment description: [buildbot-configs] Part 3, v1.5 [Checked in: Comment 20] → [buildbot-configs] Part 3, v1.5 [Checked in: Comment 21]
Comment on attachment 599016 [details] [diff] [review]
[buildbot-configs] Part 4, v1
[Checked in: Comment 22]

http://hg.mozilla.org/build/buildbot-configs/rev/fcd16841e442
Attachment #599016 - Attachment description: [buildbot-configs] Part 4, v1 → [buildbot-configs] Part 4, v1 [Checked in: Comment 22]
Status: NEW → ASSIGNED
Target Milestone: --- → seamonkey2.11
Comment on attachment 611410 [details] [diff] [review]
(AAv1) Remove overridden --enable-jemalloc, in-tree
[Checked in: Comment 25 & 32]

Please re-nominate once r+'d and ready.
Attachment #611410 - Flags: approval-mozilla-aurora?
Attachment #611410 - Flags: approval-comm-aurora?
Attachment #611410 - Flags: review?(bugspam.Callek)
Attachment #611410 - Flags: review+
Attachment #611410 - Flags: approval-comm-aurora?
Attachment #611410 - Flags: approval-comm-aurora+
Comment on attachment 611410 [details] [diff] [review]
(AAv1) Remove overridden --enable-jemalloc, in-tree
[Checked in: Comment 25 & 32]

http://hg.mozilla.org/comm-central/rev/6f65dcd99c1a
Attachment #611410 - Attachment description: (AAv1) Remove overridden --enable-jemalloc, in-tree → (AAv1) Remove overridden --enable-jemalloc, in-tree [Checked in: Comment 25]
Keywords: checkin-needed
Whiteboard: [c-n: 6f65dcd99c1a to c-a]
Comment on attachment 613995 [details] [diff] [review]
(ABv1) Remove overridden --enable-jemalloc, in buildbot-configs tree (except for SeaMonkey 2.0)
[Checked in: Comment 28]

Review of attachment 613995 [details] [diff] [review]:
-----------------------------------------------------------------

Please land on _default_ branch
Attachment #613995 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 613995 [details] [diff] [review]
(ABv1) Remove overridden --enable-jemalloc, in buildbot-configs tree (except for SeaMonkey 2.0)
[Checked in: Comment 28]

http://hg.mozilla.org/build/buildbot-configs/rev/7acf96676562
Attachment #613995 - Attachment description: (ABv1) Remove overridden --enable-jemalloc, in buildbot-configs tree (except for SeaMonkey 2.0) → (ABv1) Remove overridden --enable-jemalloc, in buildbot-configs tree (except for SeaMonkey 2.0) [Checked in: Comment 28]
Serge, changeset 6f65dcd99c1a (cf. whiteboard) alone cannot be checked into c-a because the file it modifies does not exist yet. Please clarify.
(In reply to Jens Hatlak (:InvisibleSmiley) from comment #29)
> Serge, changeset 6f65dcd99c1a (cf. whiteboard) alone cannot be checked into
> c-a because the file it modifies does not exist yet. Please clarify.

Oh, right:
Callek, do you want to land your parts 5 and 6 on aurora/2.10 now? Or what's the plan?
Yes 5 and 6 should land on aurora, I actually *thought* I already did... but unless Jens beats me to it I'll land these 3 patches myself within the next day or two
http://hg.mozilla.org/releases/comm-aurora/rev/d3d5803a732f
http://hg.mozilla.org/releases/comm-aurora/rev/f128b236d7b0
http://hg.mozilla.org/releases/comm-aurora/rev/604396ff867c

We'll need to do work for the release configs in-tree for 2.10 beta, but I'll mark this fixed for now anyway.
Status: ASSIGNED → RESOLVED
Closed: 8 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
Whiteboard: [c-n: 6f65dcd99c1a to c-a]
Attachment #599292 - Attachment description: [comm-central] Part 5, copy mozconfigs from buildbot-configs directly. (Not Release Configs yet) [Checked in: Comment 16] → [comm-central] Part 5, copy mozconfigs from buildbot-configs directly. (Not Release Configs yet) [Checked in: Comment 16 & 32]
Attachment #599295 - Attachment description: [comm-central] Part 6, make use of MOZ_UPDATE_CHANNEL so that other trains work right [Checked in: Comment 17] → [comm-central] Part 6, make use of MOZ_UPDATE_CHANNEL so that other trains work right [Checked in: Comment 17 & 32]
Attachment #611410 - Attachment description: (AAv1) Remove overridden --enable-jemalloc, in-tree [Checked in: Comment 25] → (AAv1) Remove overridden --enable-jemalloc, in-tree [Checked in: Comment 25 & 32]
Flags: in-testsuite-
Summary: Move Mozconfigs into Source Tree → Move SeaMonkey mozconfigs into source tree
You need to log in before you can comment on or make changes to this bug.