553059 - releasenotes url should be overridable

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P3)

Description

[[e-mail] (:bhearsum)]

From now on we're going to be using http://www.mozilla.org/projects/devpreview/releasenotes/ for the devpreview releases, we need to update the patcher configs to reflect this.

Comment 1

[Rail Aliiev [:rail]]

Attachment: Proposed fix

Comment 2

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

Also need to update
 http://hg.mozilla.org/build/tools/file/default/release/patcher-config-bump.pl
or it'll be reset at the next release.

Comment 3

[Rail Aliiev [:rail]]

Attachment: patcher-config-bump.pl.diff

Comment 4

[Rail Aliiev [:rail]]

Attachment: patcher-config-bump.pl.diff

typo

Comment 5

[[e-mail] (:bhearsum)]

Comment on attachment 433318 [details] [diff] [review]
Proposed fix

this is fine

Comment 6

[[e-mail] (:bhearsum)]

Comment on attachment 433517 [details] [diff] [review]
patcher-config-bump.pl.diff

Rail, this patch isn't going to work, unfortunately. We need to be able to support alphas which are "devpreview" style and ones that aren't.

Nick threw out the idea of getting a redirect put in from .com -> .org rather than us hacking around it. I'll look into doing that tomorrow.

Comment 7

[[e-mail] (:bhearsum)]

So, I didn't talk to drivers but given that we're going to be doing at least one 3.7 alpha which is not a devpreview, and we don't know which one it will be, I don't think a redirect is going to fly.

Unless someone has a better idea, I think we need to move the url into the release config. Incidentally, I think we might need something special for the lorentz beta(s) too, which may be another use case for it. Nick or Catlee, any better ideas?

Comment 8

[[e-mail] (:bhearsum)]

sorry, bugzilla fail -- didn't mean to move this.

Comment 9

[Chris Cooper [:coop] (he/him)]

Assigning to Rail based on WIP.

Comment 10

[Rail Aliiev [:rail]]

Attachment: patcher-config-bump.pl changes

Comment 11

[Rail Aliiev [:rail]]

Attachment: buildbotcustom changes

Comment 12

[Rail Aliiev [:rail]]

Attachment: buildbot-configs changes

Comment 13

[[e-mail] (:bhearsum)]

Comment on attachment 437253 [details] [diff] [review]
patcher-config-bump.pl changes

This is mostly OK, but there's some more work to do:
* I like that the existing defaults have been kept because it lets us not explicitly specify the URL in many cases
* I think the %product% and %appVersion% interpolation is overkill. If it's being overridden, let's just be explicit about it. Please drop this logic.
* Release::Patcher::Config needs to be updated too (http://hg.mozilla.org/build/tools/file/22d2297dab86/lib/perl/Release/Patcher/Config.pm#l11). This library is already used by patcher-config-creator.pl, which is used in the major update generation. It's probably worthwhile to get patcher-config-bump.pl using that library, too. You may need to get ReleaseUpdatesFactory to set PERL5LIB to make that work.

Comment 14

[[e-mail] (:bhearsum)]

Comment on attachment 437254 [details] [diff] [review]
buildbotcustom changes

The bits you have here are fine, but MajorUpdateFactory needs updating as well. Note that in the configs we'll need to have majorUpdateReleasenotesURL for branches in which majorUpdateRepo != None.

Comment 15

[[e-mail] (:bhearsum)]

Comment on attachment 437255 [details] [diff] [review]
buildbot-configs changes

It sucks that we need to use releasenotesURL = None to say "use the default", but it's o.k. overall.

Nits:
* releaseNotesUrl insetad of releasenotesURL
* Move it up above useBetaChannel
* For branches which have a major update (eg, 1.9.1), majorUpdateReleaseNotesUrl needs to be added, and passed to MajorUpdateFactory appropriately.

Comment 16

[Rail Aliiev [:rail]]

Just to don't forget, (In reply to comment #15)
> * For branches which have a major update (eg, 1.9.1),
> majorUpdateReleaseNotesUrl needs to be added, and passed to MajorUpdateFactory
> appropriately.

Good idea. In this case bug 556941 will be fixed as well.

Comment 17

[Rail Aliiev [:rail]]

Some comments for the patches to be attached

(In reply to comment #13)
> * I think the %product% and %appVersion% interpolation is overkill. If it's
> being overridden, let's just be explicit about it. Please drop this logic.

Done.

> * Release::Patcher::Config needs to be updated too
> (http://hg.mozilla.org/build/tools/file/22d2297dab86/lib/perl/Release/Patcher/Config.pm#l11).
> This library is already used by patcher-config-creator.pl, which is used in the
> major update generation. It's probably worthwhile to get patcher-config-bump.pl
> using that library, too. You may need to get ReleaseUpdatesFactory to set
> PERL5LIB to make that work.

patcher-config-bump.pl now uses the same subroutine:

   $currentUpdateObj->{'details'} = $releaseNotesUrl ||
       GetProductDetails(product => $product, appVersion => $appVersion,
                         updateType => 'minor');

PERL5LIB env added as well.

(In reply to comment #14)
> The bits you have here are fine, but MajorUpdateFactory needs updating as well.
> Note that in the configs we'll need to have majorUpdateReleasenotesURL for
> branches in which majorUpdateRepo != None.

Done.

(In reply to comment #15)
> * releaseNotesUrl insetad of releasenotesURL
> * Move it up above useBetaChannel
> * For branches which have a major update (eg, 1.9.1),
> majorUpdateReleaseNotesUrl needs to be added, and passed to MajorUpdateFactory
> appropriately.

Done.

I tested the patches in staging using 1.9.1 (to have MU)  with the following results.

1. patcher-config-bump.pl changes

* update builder, bump step ran as

    perl ../tools/release/patcher-config-bump.pl -p firefox -r Firefox -v 3.5.9 -a 3.5.9 -o 3.5.8 -b 1 -c patcher-configs/moz191-branch-patcher2.cfg -t staging-stage.build.mozilla.org -f ftp.mozilla.org -d download.mozilla.org -l shipped-locales -u

* diff_patcher_config  output contains +- for betatest-url and buildids, details URL is still the same:
    
  details   http://www.mozilla.com/%locale%/firefox/3.5.9/releasenotes/

2. patcher-config-creator.pl changes

create_config step ran as
 perl ../tools/release/patcher-config-creator.pl -p firefox -r Firefox -v 3.6rc2 -a 3.6 -o 3.5.9 --old-app-version=3.5.9 -b 1 --old-build-number=1 -c patcher-configs/moz191-branch-major-update-patcher2.cfg -t staging-stage.build.mozilla.org -f ftp.mozilla.org -d download.mozilla.org -l shipped-locales --old-shipped-locales=old-shipped-locales --update-type=major -u -n http://www.mozilla.com/%locale%/firefox/3.6/details/index.html

diff_patcher_config (for moz191-branch-major-update-patcher2.cfg) output contains some staging related changes, buildid changes and finally

-  details   http://www.mozilla.com/%locale%/firefox/3.6.3/details/index.html
+ details   http://www.mozilla.com/%locale%/firefox/3.6/details/index.html

which is a good sign for bug 556941. :)

Maybe it is an overkill to test such changes running a full release process, but it was very educational for me. :)

Comment 18

[Rail Aliiev [:rail]]

Attachment: tools changes

Comment 19

[Rail Aliiev [:rail]]

Attachment: buildbotcustom changes

Comment 20

[Rail Aliiev [:rail]]

Attachment: buildbot-configs changes

Comment 21

[[e-mail] (:bhearsum)]

Comment on attachment 437797 [details] [diff] [review]
tools changes

This looks fine, other than my incredibly tiny nit:
releasenotes-url should be before help/run-tests in the options. r+ w/ that changed.

Comment 22

[[e-mail] (:bhearsum)]

Comment on attachment 437799 [details] [diff] [review]
buildbot-configs changes

You missed updating MajorUpdateFactory on the production side -- looks fine otherwise.

Comment 23

[Rail Aliiev [:rail]]

Attachment: tools changes

(In reply to comment #21)
> releasenotes-url should be before help/run-tests in the options. r+ w/ that
> changed.

Done.

Comment 24

[Rail Aliiev [:rail]]

Attachment: buildbot-configs changes

(In reply to comment #22)
> You missed updating MajorUpdateFactory on the production side -- looks fine
> otherwise.

My fault. Fixed.

Comment 25

[Rail Aliiev [:rail]]

I tested major_update builder staging and it ran without any failure.
major_update_verify builders failed because they were unable to find updates for "mn" (new in 3.6.x afaik):

Using  http://staging-stage.build.mozilla.org/update/1/Firefox/3.5.9/20100407041608/Linux_x86-gcc3/mn/betatest/update.xml?force=1
FAIL: no partial update found for http://staging-stage.build.mozilla.org/update/1/Firefox/3.5.9/20100407041608/Linux_x86-gcc3/mn/betatest/update.xml?force=1
FAIL: download_mars returned non-zero exit code: 1
Using  http://staging-stage.build.mozilla.org/update/1/Firefox/3.5.9/20100407041608/Linux_x86-gcc3/mn/betatest/update.xml?force=1
FAIL: no complete update found for http://staging-stage.build.mozilla.org/update/1/Firefox/3.5.9/20100407041608/Linux_x86-gcc3/mn/betatest/update.xml?force=1
FAIL: download_mars returned non-zero exit code: 1

Comment 26

[[e-mail] (:bhearsum)]

(In reply to comment #25)
> I tested major_update builder staging and it ran without any failure.
> major_update_verify builders failed because they were unable to find updates
> for "mn" (new in 3.6.x afaik):

Almost right. "mn" was dropped in 3.6. Because we use the "from" release's list of locales to test, we fail on any locales which are dropped.

I had a look over the snippets and they look fine. This is ready to land, as far as I'm concerned.

Comment 28

[[e-mail] (:bhearsum)]

Comment on attachment 437798 [details] [diff] [review]
buildbotcustom changes

changeset:   697:670969d5525c

Comment 29

[[e-mail] (:bhearsum)]

Comment on attachment 438049 [details] [diff] [review]
tools changes

changeset:   575:330b61674a6d

Comment 30

[[e-mail] (:bhearsum)]

This tested out fine in my staging run.