508674 - Simplify branch config

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Chris AtLee [:catlee]]

There's an awful lot of repeated information in config.py  (e.g. almost every line starting with BRANCHES['mozilla-...']['platforms']['...']).  We should be able to clean this up significantly.

It might also be nice to have each branch config live in its own file.

Comment 1

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

Cleanup work sounds like future work to me. :)

Comment 2

[Chris AtLee [:catlee]]

Attachment: simplify staging configs

Comment 3

[[e-mail] (:bhearsum)]

Comment on attachment 424280 [details] [diff] [review]
simplify staging configs

This looks good. What do you think of setting these things as global defaults:
parts of the env: OBJDIR, SYMBOL_SERVER_{HOST,USER,PATH}, TINDERBOX_OUTPUT, MOZ_CRASHREPORTER_NO_REPORT
platform_objdir
upload_symbols
profiled_build

Some of these are the same everywhere, and some of them are the same for all but one platform.

Comment 4

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 424280 [details] [diff] [review]
simplify staging configs

I'd agree with what Ben said, except for maybe profiledbuild. There's a lot of binary things we could set a default for in global or platform vars, and then disable/enable for particular branches as needed. Not sure if that's more readable than the verbosity we have now, since you have to go look up the default value.

Overall this should make it vastly easier to minimize the differences between staging and production configs too.

>+    for branch in branches:
>+        pprint.pprint(BRANCHES[branch])

Dumping the full/part config like this will be great for inspection, but please print out the branch name prior to the pprint.

Comment 5

[Chris AtLee [:catlee]]

Comment on attachment 424280 [details] [diff] [review]
simplify staging configs

changeset:   2032:f07d6cd870f1

Comment 6

[Chris AtLee [:catlee]]

Attachment: simplify production configs

same idea as with staging configs.

I've also updated some of the settings and comments in staging so the diff between production and staging is cleaner.

Comment 7

[[e-mail] (:bhearsum)]

Comment on attachment 425482 [details] [diff] [review]
simplify production configs

I compared this against the existing production configs and there are some differences:
* build space on some 1.9.1/tracemonkey builders
* mac env vars (this version fixes some inconsistencies)
* mozconfig path for places linux64 builder is fixed


I think all of these changes are fine.

Comment 8

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 425482 [details] [diff] [review]
simplify production configs

>diff --git a/mozilla2/config.py b/mozilla2/config.py
>+    'major_version': '1.9.2',

Is this even used any more ? I only see it config.py's. Followup if you prefer.

> BRANCHES = {
>     'mozilla-central': {},
>-    'mozilla-1.9.1': {},
>+    'mozilla-1.9.1': {'platforms': {
>+            'linux': {},
>+            'linux64': {},
>+            'win32': {},
>+            'macosx': {},
>+            'linux-debug': {},
>+            'macosx-debug': {},
>+            'win32-debug': {}
>+        }},

Now that WinCE got disabled this is the standard set of 7 platforms. Want to leave it this way in case WinCE comes back again ? Same for the project branches.

Comment 9

[Chris AtLee [:catlee]]

Attachment: simplify production configs

same as before, except lists of platforms have been removed where they match the global set, and major_version has been removed

Comment 10

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 425979 [details] [diff] [review]
simplify production configs

Thanks!

Comment 11

[Chris AtLee [:catlee]]

Comment on attachment 425979 [details] [diff] [review]
simplify production configs

changeset:   2080:75e82e1b4356

Comment 12

[Chris AtLee [:catlee]]

I'd call this done.