796995 - create mozilla-esr17 branch

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Description

[[e-mail] (:bhearsum)]

Needs to be cloned off of mozilla-beta late in the cycle. We'll need build configs, test configs, initial release configs, etc. It's been awhile since we did a new branch set-up like this, these bugs should serve as a decent model:
https://bugzilla.mozilla.org/show_bug.cgi?id=717106
https://bugzilla.mozilla.org/show_bug.cgi?id=663820

Note that like mozilla-esr10, we don't separate l10n repos for them.

Comment 1

[Rail Aliiev [:rail]]

I created mozilla-esr17 and comm-esr17-thunderbird treestatus entries ("approval required")

Comment 2

[Rail Aliiev [:rail]]

Attachment: tools

Comment 3

[Rail Aliiev [:rail]]

Attachment: buildbotcustom

Instead of using on 'production' branch (default value) it'd be better to use tagged version. Much easier for dev releases. Not a blocker.

Comment 4

[Rail Aliiev [:rail]]

Attachment: configs

Inline comments incoming.

Comment 5

[Rail Aliiev [:rail]]

Comment on attachment 678775 [details] [diff] [review]
configs

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

I tested the patches. CI and release builds worked quite fine. You can review the status here:
http://dev-master01.build.scl1.mozilla.com:8033/builders
http://dev-master01.build.scl1.mozilla.com:8033/waterfall?category=release-mozilla-esr17-
http://dev-master01.build.scl1.mozilla.com:8033/waterfall?category=release-comm-esr17-

No updates will be generated as a part of 17.0.0esr build.

::: mozilla-tests/config.py
@@ -13,5 @@
>  REMOTE_PROCESS_NAMES = { 'default':         'org.mozilla.fennec',
>                           'mozilla-beta':    'org.mozilla.firefox_beta',
>                           'mozilla-aurora':  'org.mozilla.fennec_aurora',
>                           'mozilla-release': 'org.mozilla.firefox',
> -                         'mozilla-esr10':   'org.mozilla.firefox',

We don't build Fennec off esr anymore.

@@ +79,5 @@
> +            'linux': {},
> +            'linux64' : {},
> +        },
> +        'lock_platforms': True,
> +    },

not inheriting all platforms because we don't build mobile off esr

@@ -961,5 @@
>  
> -# pgo-strategy
> -BRANCHES['mozilla-aurora']['pgo_strategy'] = 'per-checkin'
> -BRANCHES['mozilla-beta']['pgo_strategy'] = 'per-checkin'
> -BRANCHES['mozilla-release']['pgo_strategy'] = 'per-checkin'

I've just moved these to the corresponding sections.

::: mozilla-tests/thunderbird_config.py
@@ -1,5 @@
>  from copy import deepcopy
>  
> -from config import BRANCH_UNITTEST_VARS, MOZHARNESS_REPO
> -from localconfig import SLAVES, TRY_SLAVES, GLOBAL_VARS, GRAPH_CONFIG, \
> -                        PLATFORM_VARS

removed unused imports

@@ +445,5 @@
>  BRANCHES['comm-aurora']['repo_path'] = "releases/comm-aurora"
>  
>  ######## comm-esr10
>  BRANCHES['comm-esr10']['pgo_strategy'] = None
> +BRANCHES['comm-esr17']['repo_path'] = "releases/comm-esr10"

Looks like we missed this.

@@ +470,5 @@
>  
>  if __name__ == "__main__":
> +    import sys
> +    import pprint
> +    from buildbot.process.properties import WithProperties

removed unused re import
added missing WithProperties import

::: mozilla/l10n/all-locales.mozilla-1.9.1
@@ -1,1 @@
> -af

we don't use these anymore

::: mozilla/release-firefox-mozilla-esr17.py
@@ +38,5 @@
> +releaseConfig['sourceRepositories']  = {
> +    'mozilla': {
> +        'name': 'mozilla-esr17',
> +        'path': 'releases/mozilla-esr17',
> +        'revision': 'FIXME',

FIXMEs added to pass tests_masters.sh. I doesn't pass release sanity though. Will be replaced with real values when we build.

::: mozilla2/linux/comm-esr17/release/mozconfig
@@ +1,1 @@
> +ac_add_options --enable-application=mail

we still need linux mozconfig for the source tarball builder. builds use the in-tree mozconfigs.

Comment 6

[Rail Aliiev [:rail]]

Comment on attachment 678768 [details] [diff] [review]
buildbotcustom

http://hg.mozilla.org/build/buildbotcustom/rev/774710239018

Comment 7

[Aki Sasaki (not active)]

Comment on attachment 678775 [details] [diff] [review]
configs

>-BRANCHES['mozilla-esr10']['platforms']['linux']['enable_mobile_unittests'] = True

I think we should tear out all enable_mobile_unittests code.
IIRC this was for either QT or fennec desktop testing.
This probably deserves another bug.

>+    'mozilla-esr17': {
>+        'tinderbox_tree': 'Mozilla-Esr17',
>+        'mobile_tinderbox_tree': 'Mozilla-Esr17',
>+    },
>+        'tinderbox_tree': 'Thunderbird-Esr17',

Are you going to create the Mozilla-Esr17 and Thunderbird-Esr17 tinderbox pages?
(The Esr10 pages look blank so it might not be necessary.)
I wonder if it's time to start tearing tinderbox related code out, and just leave it on for l10n.

> ######## comm-esr10
> BRANCHES['comm-esr10']['pgo_strategy'] = None
>+BRANCHES['comm-esr17']['repo_path'] = "releases/comm-esr10"

I think you mean BRANCHES['comm-esr10']

>diff --git a/mozilla/l10n-changesets_mozilla-esr17 b/mozilla/l10n-changesets_mozilla-esr17

Are you going to copy the m-r changesets later?

>diff --git a/mozilla/l10n-changesets_thunderbird-esr17 b/mozilla/l10n-changesets_thunderbird-esr17

Here too

>-releaseConfig['ftpSymlinkName'] = 'latest-esr'
>+releaseConfig['ftpSymlinkName'] = 'latest-10.0esr'

Was this the name we decided on?
If I were to bikeshed, I'd say latest-esr10, but I don't have strong feelings on the matter.

>+# Basic product configuration
>+#  Names for the product/files
>+releaseConfig['productName']         = 'thunderbird'
>+releaseConfig['appName']             = 'mail'
>+releaseConfig['mozilla_dir']         = 'mozilla'
>+#  Current version info
>+releaseConfig['version']             = '17.0.0esr'
>+releaseConfig['appVersion']          = '17.0.10'

Should this be 17.0.0 ?

>+    'build/compare-locales': 'RELEASE_0_8_2',

I think we should bump this to RELEASE_0_9_5, which is what RELEASE_AUTOMATION is pointing to.  esr10 was pointing at 0_8_2 to avoid any sort of unexpected change.

(The above goes for [staging_]release-firefox-mozilla-esr17.py and [staging_]release-thunderbird-comm-esr17.py)

Comment 8

[Rail Aliiev [:rail]]

Attachment: configs

Carrying over aki's r+. Updated configs with comments addressed

> This probably deserves another bug.
Yup.
 
> Are you going to create the Mozilla-Esr17 and Thunderbird-Esr17 tinderbox
> pages?

I'm not sure. We don't build l10n nighlies/deps, so probably nothing to be reported. I haven't created those yet. I can create them in the future if something fails.

> > ######## comm-esr10
> > BRANCHES['comm-esr10']['pgo_strategy'] = None
> >+BRANCHES['comm-esr17']['repo_path'] = "releases/comm-esr10"
> 
> I think you mean BRANCHES['comm-esr10']

Bah, silly copy/paste mistake. Fixed.
 
> >diff --git a/mozilla/l10n-changesets_mozilla-esr17 b/mozilla/l10n-changesets_mozilla-esr17
> 
> Are you going to copy the m-r changesets later?

Yeah, those should be added as part of the 17.0.0esr tracking bug. I left it empty to make release sanity fail.

> >-releaseConfig['ftpSymlinkName'] = 'latest-esr'
> >+releaseConfig['ftpSymlinkName'] = 'latest-10.0esr'
> 
> Was this the name we decided on?
> If I were to bikeshed, I'd say latest-esr10, but I don't have strong
> feelings on the matter.

I just followed our current naming schema on ftp. Nothing new.

> >+releaseConfig['appVersion']          = '17.0.10'
> 
> Should this be 17.0.0 ?

Fixed.
 
> >+    'build/compare-locales': 'RELEASE_0_8_2',
> 
> I think we should bump this to RELEASE_0_9_5, which is what
> RELEASE_AUTOMATION is pointing to.  esr10 was pointing at 0_8_2 to avoid any
> sort of unexpected change.

Good catch.

Thanks for the quick review!

Comment 9

[Kim Moir [:kmoir] ET]

buildbotcustom patch in production

Comment 10

[John Hopkins (:jhopkins)]

Comment on attachment 678814 [details] [diff] [review]
configs

Looks good except for the following.  Giving my r+ with these looked at:

1) for 'MERGE DAY' sections we should have a bug and owner listed.  https://wiki.mozilla.org/ReleaseEngineering:MergeDuty

2) 'TODO for 17.0.1esr' comments should reference a bug that depends on a 17.0.1esr tracking bug.

3) mozconfig files use     CC=/tools/gcc-4.5-0moz3/bin/gcc
  l10n-mozconfig files use CC=/tools/gcc-4.5/bin/gcc

I see mozilla-release is the same but wanted to point out the difference in settings between l10n and non-l10n mozconfigs.

Comment 11

[Rail Aliiev [:rail]]

(In reply to John Hopkins (:jhopkins) from comment #10)
> Looks good except for the following.  Giving my r+ with these looked at:
> 
> 1) for 'MERGE DAY' sections we should have a bug and owner listed. 
> https://wiki.mozilla.org/ReleaseEngineering:MergeDuty

I filed 2 bugs and updated the page:
https://wiki.mozilla.org/ReleaseEngineering:MergeDuty#ESR_10_EOL
 
> 2) 'TODO for 17.0.1esr' comments should reference a bug that depends on a
> 17.0.1esr tracking bug.

I filed bug 809319 and bug 809320 for those.

> 3) mozconfig files use     CC=/tools/gcc-4.5-0moz3/bin/gcc
>   l10n-mozconfig files use CC=/tools/gcc-4.5/bin/gcc
> 
> I see mozilla-release is the same but wanted to point out the difference in
> settings between l10n and non-l10n mozconfigs.


Yeah... That's not critical and may need additional testing. I believe we're close to switch to in-tree mozconfigs for releases soon.

Thanks for the review.

Comment 12

[Rail Aliiev [:rail]]

Comment on attachment 678767 [details] [diff] [review]
tools

http://hg.mozilla.org/build/tools/rev/0c46d57109fe

Comment 13

[Rail Aliiev [:rail]]

Comment on attachment 678814 [details] [diff] [review]
configs

http://hg.mozilla.org/build/buildbot-configs/rev/2ad8a9df55ca

Comment 14

[Rail Aliiev [:rail]]

in production

Comment 15

[Rail Aliiev [:rail]]

Done!

Comment 16

[[e-mail] (:bhearsum)]

Note for next time - the release management team should take care of any post-cloning changes to the mozilla-esr24 repository. RelEng isn't responsible for those.

Comment 17

[Rail Aliiev [:rail]]

I pushed this as well: http://hg.mozilla.org/build/buildbot-configs/rev/1a3fdd2eaf9d