869568 - adjust ship it version suggestion logic for new style esr versioning

Status: RESOLVED FIXED

(Release Engineering :: Release Automation: Other, defect)

Description

[[e-mail] (:bhearsum)]

Starting with ESR24 we may be moving to a new style of versioning that allows for easy distinguishing between planned and unplanned releases. Under this plan, we'd have version numbers like:
24.x.y

Where x is incremented for a planned version, and y is incremented for an unplanned one. Currently, ship it will only suggest a version with y bumped. We'll want it to suggest a version with X bumped (and y reset to 0) too. A couple examples:
24.4.0 -> 24.4.1, 24.5.0
24.8.1 -> 24.8.2, 24.9.0

Holding off on doing this until we know for sure that we're moving in this direction.

Comment 1

[Lukas Blakk [:lsblakk] use ?needinfo]

Assigning to Ben for now, tracking for 24, re-assign to another relenger as desired.

Comment 2

[[e-mail] (:bhearsum)]

Attachment: support both styles

Need to import this into ship it if this looks OK.

Comment 3

[Rail Aliiev [:rail]]

Comment on attachment 760406 [details] [diff] [review]
support both styles

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

::: lib/python/build/versions.py
@@ +107,2 @@
>      if esr:
> +        first, second, _ = version.split('.')

A nit. Can you use version.split('.', 2) instead to make sure that the code doesn't fail for versions with 3 and more dots. A test for this case is welcome. :)

Comment 4

[[e-mail] (:bhearsum)]

Comment on attachment 760406 [details] [diff] [review]
support both styles

Landed, with the split limitation.

Comment 5

[[e-mail] (:bhearsum)]

Pushed to ship it in http://git.mozilla.org/?p=build/release-kickoff.git;a=commitdiff;h=c537ebaba9863151567a17a6ee6b1bc45368c92c;hp=e783e2b6fbcb3c5ad2ca1db2d0ae344a66121bf4

No review because it's a straight code dump.

Comment 6

[[e-mail] (:bhearsum)]

Looked fine in ship it dev, pushed to stage and prod.

Comment 7

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

tl;dr: this new code doesn't handle versions with only a single dot, like 24.0. Was it intended we should use 24.0.0 ?

For 24.0 ESR we didn't want any partials, but ship-it required something in that form field. We decided to put in a fake release of '24.0build0' and set 
   releaseConfig['partialUpdates']      = {}
in the release config template.

This caused 500 errors for these urls:
  https://ship-it.mozilla.org/release.html?name=Firefox-24.0esr-build1
  https://ship-it.mozilla.org/submit_release.html
This was still OK:
  https://ship-it.mozilla.org/releases/Firefox-24.0esr-build1

The exception behind the 500s was:
2013-09-10 17:05:27,566 - kickoff.log_exception#1306: Exception on /release.html [GET]
Traceback (most recent call last):
  File "/data/www/ship-it.mozilla.org/release-kickoff/vendor/lib/python/flask/app.py", line 1687, in wsgi_app
    response = self.full_dispatch_request()
  File "/data/www/ship-it.mozilla.org/release-kickoff/vendor/lib/python/flask/app.py", line 1360, in full_dispatch_request
    rv = self.handle_user_exception(e)
  File "/data/www/ship-it.mozilla.org/release-kickoff/vendor/lib/python/flask/app.py", line 1358, in full_dispatch_request
    rv = self.dispatch_request()
  File "/data/www/ship-it.mozilla.org/release-kickoff/vendor/lib/python/flask/app.py", line 1344, in dispatch_request
    return self.view_functions[rule.endpoint](**req.view_args)
  File "/data/www/ship-it.mozilla.org/release-kickoff/vendor/lib/python/flask/views.py", line 83, in view
    return self.dispatch_request(*args, **kwargs)
  File "/data/www/ship-it.mozilla.org/release-kickoff/vendor/lib/python/flask/views.py", line 150, in dispatch_request
    return meth(*args, **kwargs)
  File "/data/www/ship-it.mozilla.org/release-kickoff/kickoff/views/releases.py", line 132, in get
    form = getReleaseForm(name)()
  File "/data/www/ship-it.mozilla.org/release-kickoff/vendor/lib/python/wtforms/form.py", line 178, in __call__
    return type.__call__(cls, *args, **kwargs)
  File "/data/www/ship-it.mozilla.org/release-kickoff/kickoff/views/forms.py", line 291, in __init__
    ReleaseForm.__init__(self, prefix='firefox', product='firefox', *args, **kwargs)
  File "/data/www/ship-it.mozilla.org/release-kickoff/kickoff/views/forms.py", line 170, in __init__
    self.addSuggestions()
  File "/data/www/ship-it.mozilla.org/release-kickoff/kickoff/views/forms.py", line 271, in addSuggestions
    ReleaseForm.addSuggestions(self)
  File "/data/www/ship-it.mozilla.org/release-kickoff/kickoff/views/forms.py", line 228, in addSuggestions
    for v in getPossibleNextVersions(version):
  File "/data/www/ship-it.mozilla.org/release-kickoff/vendor/lib/python/mozilla/build/versions.py", line 55, in getPossibleNextVersions
    first, second, _ = version.split('.', 2)
ValueError: need more than 2 values to unpack

Comment 8

[Rail Aliiev [:rail]]

Attachment: add support for N.0esr versions

Comment 9

[Rail Aliiev [:rail]]

Attachment: add support for N.0esr versions

More readable version.

======================  test_build_versions.py  ======================
.................................
----------------------------------------------------------------------
Ran 33 tests in 0.003s

OK
*******************************************************************************

Comment 10

[Rail Aliiev [:rail]]

Comment on attachment 802729 [details] [diff] [review]
add support for N.0esr versions

https://hg.mozilla.org/build/tools/rev/aeeb6d1bbdc8

Comment 11

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

http://git.mozilla.org/?p=build/release-kickoff.git;a=commitdiff;h=3e14de04fbf5170485fcb753f37ebd5b4926ad65

Comment 12

[[e-mail] (:bhearsum)]

Ack, sorry that this caused you trouble. My bad.

Comment 13

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

Ben, was the intention to use 24.0.0 ? After writing and testing the fix I found some releases on the dev instance of ship-it like that.

Do you want to back this out and change our process, or leave it in ?

Comment 14

[[e-mail] (:bhearsum)]

(In reply to Nick Thomas [:nthomas] from comment #13)
> Ben, was the intention to use 24.0.0 ? After writing and testing the fix I
> found some releases on the dev instance of ship-it like that.

Definitely not my intention.

> Do you want to back this out and change our process, or leave it in ?

Nope, this is exactly what we want!

Comment 15

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

All done then.