836041 - Can't provide alternate mozconfigs for comm-esr17 when building esr versus mainstream

Status: RESOLVED FIXED

(Release Engineering :: Release Requests, defect)

Description

[Mark Banner (:standard8)]

Issue:

For TB 17 mainstream & TB 17 esr, we want to build both off of comm-esr17 with different mozconfigs for esr versus release.

However, this is currently not possible for l10n-mozconfigs as the location is hard-coded based on source repository:

http://hg.mozilla.org/build/tools/annotate/945eec76c4d6/scripts/l10n/create-release-repacks.py#l186

mozconfig = path.join("buildbot-configs", "mozilla2", options.platform,
                      sourceRepoInfo['name'], "release", "l10n-mozconfig")

This means we can't set up different options (e.g. channel name, add add export MOZ_ESR=1).

Comment 1

[Mark Banner (:standard8)]

I think this is the main thing blocking building TB 17 ESR and mainstream from the comm-esr17 repos (bug 815302), but I do not have time to work on it.

Options I see are:

1) Change the current scripts to allow a different directory (or mozconfig name) e.g.

mozconfig = path.join("buildbot-configs", "mozilla2", options.platform,
                      sourceRepoInfo['name'], config["l10n_mozconfig_dir"], "l10n-mozconfig")

2) Move the mozconfigs to be in-tree as per bug 758149

Comment 2

[John Hopkins (:jhopkins)]

Since the only difference between esr and release mozconfigs is the export MOZ_ESR=1, we could try a workaround and export that MOZ_ESR=1 via the buildbot-configs.

eg. http://hg.mozilla.org/build/buildbot-configs/file/6fef12fe7bcd/mozilla/thunderbird_config.py#l948

As standard8 points out, it would also have to work for l10n.

Comment 3

[[e-mail] (:bhearsum)]

Attachment: set MOZ_ESR only for esr

(In reply to John Hopkins (:jhopkins) from comment #2)
> Since the only difference between esr and release mozconfigs is the export
> MOZ_ESR=1, we could try a workaround and export that MOZ_ESR=1 via the
> buildbot-configs.
> 
> eg.
> http://hg.mozilla.org/build/buildbot-configs/file/6fef12fe7bcd/mozilla/
> thunderbird_config.py#l948
> 
> As standard8 points out, it would also have to work for l10n.

11:29 < bhearsum> is there any harm that could be done by having MOZ_ESR=1 set for all of the jobs on the esr branch (that is, dep, nightly en-US/l10n, etc.) (cc 
                  Standard8)
11:30 < Standard8> hmm
11:31 < Standard8> bhearsum: so we don't really want it set for dep/nightly builds

...so we can't do what's suggested in comment #2. This patch should solve the problem though.

Comment 4

[[e-mail] (:bhearsum)]

Comment on attachment 709094 [details] [diff] [review]
set MOZ_ESR only for esr

I think we need to add if [ "${MOZ_UPDATE_CHANNEL}" = "esr" ]; then and fi to the whitelist now because of this....

Comment 5

[Mark Banner (:standard8)]

(In reply to Ben Hearsum [:bhearsum] from comment #4)
> Comment on attachment 709094 [details] [diff] [review]
> set MOZ_ESR only for esr
> 
> I think we need to add if [ "${MOZ_UPDATE_CHANNEL}" = "esr" ]; then and fi
> to the whitelist now because of this....

Just remembered, if we're doing this, we also need to replace the --enable-update-channel from "esr" to "${MOZ_UPDATE_CHANNEL}" as otherwise mainstream will get built wrong.

Comment 6

[Mark Banner (:standard8)]

Attachment: set MOZ_ESR only for esr v2

Sets MOZ_ESR only for ESR, and changes the update channel to be based on ${MOZ_UPDATE_CHANNEL}.

Comment 7

[John Hopkins (:jhopkins)]

Attachment: [tools] update comm-esr17 whitelist

Comment 8

[John Hopkins (:jhopkins)]

Attachment: [tools] add if/fi to comm-esr17 exceptions list (not present in nightly mozconfig)

Comment 9

[Mark Banner (:standard8)]

Comment on attachment 710890 [details] [diff] [review]
[tools] add if/fi to comm-esr17 exceptions list (not present in nightly mozconfig)

Looks good

Comment 10

[John Hopkins (:jhopkins)]

Comment on attachment 710890 [details] [diff] [review]
[tools] add if/fi to comm-esr17 exceptions list (not present in nightly mozconfig)

Landed in http://hg.mozilla.org/build/tools/rev/7518cfdc0c6a

Comment 11

[Mark Banner (:standard8)]

Comment on attachment 710866 [details] [diff] [review]
set MOZ_ESR only for esr v2

http://hg.mozilla.org/build/buildbot-configs/rev/1b880062e1b8