432658 - Change mozilla-central product version to 3.1a1pre instead of 4.0pre

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Right now mozilla-central is identifying itself as 4.0pre, breaking all sorts of things, and missetting expectations.  It should be identifying itself as 3.1a1pre (or whatever the right version number is for the initial 3.1 release).

Comment 1

[Benjamin Smedberg]

Has there been a public discussion of this change, and the 3.1 release in general?

Comment 2

[[e-mail] (:bhearsum)]

AUS needs to be updated as well, otherwise updates will break.

http://mxr.mozilla.org/mozilla/source/webtools/aus/xml/inc/config-dist.php#84

Comment 3

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

(In reply to comment #2)
> AUS needs to be updated as well, otherwise updates will break.
> 
> http://mxr.mozilla.org/mozilla/source/webtools/aus/xml/inc/config-dist.php#84
> 
morgamic: is this AUS change something we'd need to do before opening mozilla-central?

Comment 4

[Michael Morgan [:morgamic]]

Ok, so what's the new version?

Do we need 3.1a1pre -> trunk, or what?

Comment 5

[Michael Morgan [:morgamic]]

Sorry that's vague -- the mapping that Ben pointed to simply relays the product version in the URL string to the directory on disk with relevant data.  So two versions:

1. version coming from the client in the url
2. branch version which is the name of the directory created by build system

What are 1. and 2. for 3.1a1pre -- kind of confused.

Comment 6

[Mike Schroepfer]

(In reply to comment #4)
> Ok, so what's the new version?
> 
> Do we need 3.1a1pre -> trunk, or what?
> 

3.1a1pre

Comment 7

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

The shortest path would be to map
  '3.1*'    => 'mozilla2'
and bump the app version (the nightly builds from the mozilla-central branch push into the mozilla2 dir on AUS). 

Leaving the 4.0* mapping for a while _might_ bring anyone using 4.0pre "forward" to 3.1a1pre, depending on how AUS and the partial update generator cope with the version going backwards. I'm guessing there's not very many 4.0pre users to orphan but does anyone have a way to get actual stats ?

A better mapping would be 
  '3.1*'    => 'mozilla-central'
with an update to
  http://hg.mozilla.org/build/buildbot-configs/index.cgi/file/c030b26bbaec/mozilla2/master.cfg#l34
I think it's clearer to use the Hg branch name going forward, since what we use the branch for might change as we switch over from CVS.

Comment 8

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Any news here?  We don't really care about bringing 4.0pre users back to 3.1a1pre, or bringing 3.0pre nightly users to 3.1a1pre, etc.  I don't have answers to morgamic's question (I'm pretty sure the answer for the first question will be "3.1a1pre", but I don't know the answer to the second).

Comment 9

[Michael Morgan [:morgamic]]

John or Nick -- the branch dir is mozilla2 or mozilla-central?  If we just need to pick something, fine -- let's do it.  :)

Comment 10

[Michael Morgan [:morgamic]]

Looks like mozilla2:
drwxr-xr-x  5 ffxbld firefox 4096 Apr 17 07:39 mozilla2

Comment 11

[Michael Morgan [:morgamic]]

Attachment: v1, mapping 3.1* -> mozilla2

This would map 3.1* URLs onto the mozilla2 branch directory.

We haven't discussed what will happen further down the road with 3.0*:
* should we move 3.0* out of /trunk and into /3.0 then point 3.1* and 4.0* at /trunk? 
* is it hard to do? should we leave things how they are and use mozilla2 instead?
* should we fix it sooner than later

Comment 12

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

Comment on attachment 320766 [details] [diff] [review]
v1, mapping 3.1* -> mozilla2

>+        '3.1*'    => 'mozilla2'

Lets map 3.1* to 'mozilla-central' (since the builds are from the mozilla-central, and mozilla2 != mozilla-central any more), r+ with that.

Comment 13

[Reed Loden [:reed]]

Attachment: Change version number - v1

Comment 14

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

Comment on attachment 320787 [details] [diff] [review]
Change version number - v1

Looks fine but might be incomplete. Vlad/schrep, do you want the Gecko revision to stay as 2.0a1pre ?

Comment 15

[Reed Loden [:reed]]

(In reply to comment #14)
> (From update of attachment 320787 [details] [diff] [review])
> Looks fine but might be incomplete. Vlad/schrep, do you want the Gecko revision
> to stay as 2.0a1pre ?

Ah, good point. If this is for Firefox 3.1, that's probably Gecko 1.9.1, right?

Comment 16

[Mike Shaver (:shaver emeritus)]

Use Gecko version 1.9.1a1pre.

Comment 17

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

Comment on attachment 320787 [details] [diff] [review]
Change version number - v1

New patch pls

Comment 18

[Reed Loden [:reed]]

Attachment: [checked in] Change version number - v2

Comment 19

[[e-mail] (:bhearsum)]

Not that we have many/any users, but the 4.0a1pre builds were brought "forward" to 3.1a1pre.

Comment 20

[[e-mail] (:bhearsum)]

Attachment: [checked in] changes to buildbot config for s/mozilla2/mozilla-central on aus2

We'll need to land this at the same time as attachment 320766 [details] [diff] [review] so snippets get pushed to the right place.

Comment 21

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

Comment on attachment 320916 [details] [diff] [review]
[checked in] changes to buildbot config for s/mozilla2/mozilla-central on aus2

r+

> We'll need to land this at the same time as attachment 320766 [details] [diff] [review]
> [details] so snippets get pushed to the right place.

We could move the mozilla2 dir to mozilla-central and put in a symlink to dodge this.

Comment 22

[Michael Morgan [:morgamic]]

Attachment: aus config update for mozilla-central

Just to make sure this is what cf is asking for...

Comment 23

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

Comment on attachment 320931 [details] [diff] [review]
aus config update for mozilla-central

WFM

Comment 24

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

(In reply to comment #21)
> We could move the mozilla2 dir to mozilla-central and put in a symlink to dodge
> this.

Just did this. In /opt/aus2/build/0/Firefox/, mozilla2 moved to mozilla-central, and now a symlink points to it from mozilla2.

Comment 25

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

On seconds thoughts, twas a silly plan. Undone.

Comment 26

[[e-mail] (:bhearsum)]

Comment on attachment 320790 [details] [diff] [review]
[checked in] Change version number - v2

Reed landed this in changeset 15118	e4715d4efc28

Comment 27

[David Baron :dbaron: (⌚️UTC-5, no longer working on Mozilla)]

What's blocking this bug from being marked fixed?

Comment 28

[Michael Morgan [:morgamic]]

Nothin, just had to coordinate when we were going to make the switch.  Working on it now.

Comment 29

[Reed Loden [:reed]]

Why was bug 433771 filed as IT-only?

Comment 30

[Michael Morgan [:morgamic]]

Pushed to prod - so the aus2 server-side change it done.

@reed - because "please update aus2" is super sekrit.

Comment 31

[Michael Morgan [:morgamic]]

nthomas - think this is done, resolving.

Comment 32

[[e-mail] (:bhearsum)]

Comment on attachment 320916 [details] [diff] [review]
[checked in] changes to buildbot config for s/mozilla2/mozilla-central on aus2

Forgot to land this one.

Landed in changeset:   62:e177859d6343

Comment 33

[Michael Morgan [:morgamic]]

Thx Ben. :)

Comment 34

[David Baron :dbaron: (⌚️UTC-5, no longer working on Mozilla)]

Bumping the DOM inspector extension compatibility needs to become part of the standard version bump routine as well (see bug 433935).