393264 - Version/config bumps for Firefox 2.0.0.7 release

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P1)

Description

[Robert Helmer [:rhelmer]]

Attachment: bootstrap config for rc1

Comment 1

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

Comment on attachment 277764 [details] [diff] [review]
bootstrap config for rc1

r+ with fixes noted below

>Index: fx-moz18-bootstrap.cfg
>===================================================================
...
>+oldVersion      = 2.0.0.7
>+oldRc           = 1

2.0.0.6 and 2 respectively

>+linux_buildDir  = /builds/tinderbox/Fx-Mozilla1.8-Release
>+macosx_buildDir    = /builds/tinderbox/Fx-Mozilla1.8-Release
>+win32_buildDir  = /cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-Release
>+linux_l10n_buildDir  = /builds/tinderbox/Fx-Mozilla1.8-l10n-Release
>+macosx_l10n_buildDir    = /builds/tinderbox/Fx-Mozilla1.8-l10n-Release
>+win32_l10n_buildDir  = /cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-l10n-Release

Whitespace nit: align =, and watch out for diskspace issues on the build slaves if this change is only just taking effect there.

>+linux_logDir    = /builds/logs
>+macosx_logDir   = /builds/logs
>+win32_logDir    = /builds/logs

Style nit: only need logDir here ? 

>+blat            = /cygdrive/c/moztools/bin/blat.exe

Why is this changing from d if we cloned the box ?

>+stagingServer   = build-console.build..mozilla.org

zap double dot

>+# username and server to push builds
>+sshUser         = cltbld
>+sshServer       = build-console.build.mozilla.org

Should definitely get the tinder-configs updated at some point

Comment 2

[Robert Helmer [:rhelmer]]

(In reply to comment #1)
> (From update of attachment 277764 [details] [diff] [review])
> r+ with fixes noted below
> 
> >Index: fx-moz18-bootstrap.cfg
> 
> 
> >+blat            = /cygdrive/c/moztools/bin/blat.exe
> 
> Why is this changing from d if we cloned the box ?


There is no /cygdrive/d/ on pacifica-vm (that I see)!

> >+stagingServer   = build-console.build..mozilla.org
> 
> zap double dot
> 
> >+# username and server to push builds
> >+sshUser         = cltbld
> >+sshServer       = build-console.build.mozilla.org
> 
> Should definitely get the tinder-configs updated at some point

Yeah I'll get this checked on staging

Comment 3

[Robert Helmer [:rhelmer]]

Landed with fixes, except changing logDir (I'm sure it'd be fine but I don't want to retest everything just to make sure :) Will test this on staging).

Also, I tagged this as FIREFOX_2_0_0_7_RC1

Checking in fx-moz18-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg,v  <--  fx-moz18-bootstrap.cfg
new revision: 1.13; previous revision: 1.12
done

Comment 4

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

(In reply to comment #2)
> > >+blat            = /cygdrive/c/moztools/bin/blat.exe
> > Why is this changing from d if we cloned the box ?
>
> There is no /cygdrive/d/ on pacifica-vm (that I see)!

Looks like it's always been wrong :-)

Comment 5

[Robert Helmer [:rhelmer]]

Attachment: update verification config for firefox 2007rc1

gotta automate this for sure next time :)

Comment 6

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

Comment on attachment 277969 [details] [diff] [review]
update verification config for firefox 2007rc1 

r+ if you use the 2.0.0.6 buildIDs instead of the newly minted 2.0.0.7rc1. I believe they are

win = 2007072518
linux, mac = 2007072517

And please add ro for all platforms from 2.0.0.4 onwards. It's been in beta since then and we've been generating snippets, just not testing them. Dunno how I missed that and came up with the dodgy comment.

Comment 7

[Robert Helmer [:rhelmer]]

(In reply to comment #6)
> (From update of attachment 277969 [details] [diff] [review])
> r+ if you use the 2.0.0.6 buildIDs instead of the newly minted 2.0.0.7rc1. I
> believe they are
> 
> win = 2007072518
> linux, mac = 2007072517
> 
> And please add ro for all platforms from 2.0.0.4 onwards. It's been in beta
> since then and we've been generating snippets, just not testing them. Dunno how
> I missed that and came up with the dodgy comment.
> 

Done and done. I swear I'll get this part of it automated soon (bug 373995 ftw):

Checking in moz18-firefox-linux.cfg;
/cvsroot/mozilla/testing/release/updates/moz18-firefox-linux.cfg,v  <--  moz18-firefox-linux.cfg
new revision: 1.10; previous revision: 1.9
done
Checking in moz18-firefox-mac.cfg;
/cvsroot/mozilla/testing/release/updates/moz18-firefox-mac.cfg,v  <--  moz18-firefox-mac.cfg
new revision: 1.11; previous revision: 1.10
done
Checking in moz18-firefox-win32.cfg;
/cvsroot/mozilla/testing/release/updates/moz18-firefox-win32.cfg,v  <--  moz18-firefox-win32.cfg
new revision: 1.10; previous revision: 1.9
done

Comment 8

[Robert Helmer [:rhelmer]]

Attachment: update verification config for firefox 2007rc1 as-landed

Comment 9

[Robert Helmer [:rhelmer]]

Attachment: manual version bump on GECKO181_20070712_RELBRANCH

Comment 10

[Robert Helmer [:rhelmer]]

Attachment: diff between 2006 and relbranch

Output of:
cvs rdiff -r FIREFOX_2_0_0_6_RELEASE -r GECKO181_20070712_RELBRANCH -u mozilla

Comment 11

[Robert Helmer [:rhelmer]]

Comment on attachment 280941 [details] [diff] [review]
diff between 2006 and relbranch

Here's a diff of FIREFOX_2_0_0_6_RELEASE and GECKO181_20070712_RELBRANCH.diff

Does this look reasonable to you? There was a Thunderbird release off of this branch as well.

Comment 12

[Robert Helmer [:rhelmer]]

Comment on attachment 280939 [details] [diff] [review]
manual version bump on GECKO181_20070712_RELBRANCH

I went ahead and landed so I can get started; please let me know if it looks ok.

Checking in browser/app/module.ver;
/cvsroot/mozilla/browser/app/module.ver,v  <--  module.ver
new revision: 1.11.2.16.2.3; previous revision: 1.11.2.16.2.2
done
Checking in browser/config/version.txt;
/cvsroot/mozilla/browser/config/version.txt,v  <--  version.txt
new revision: 1.4.18.15.2.3; previous revision: 1.4.18.15.2.2
done
Checking in config/milestone.txt;
/cvsroot/mozilla/config/milestone.txt,v  <--  milestone.txt
new revision: 3.27.2.14.2.3; previous revision: 3.27.2.14.2.2
done

Comment 13

[Robert Helmer [:rhelmer]]

Attachment: bump 1.8 branch to 2008

Comment 14

[Daniel Veditz [:dveditz]]

Comment on attachment 280941 [details] [diff] [review]
diff between 2006 and relbranch

I don't understand why all the config files went away (is that the automation?) but it looks like the version is still set to 2.0.0.6 (or maybe 2005) here.

Comment 15

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

Comment on attachment 280942 [details] [diff] [review]
bump 1.8 branch to 2008

r+, please get these files too
 mozilla/tools/tinderbox-configs/monitoring/Firefox_mozilla1.8.txt       
mozilla/tools/tinderbox-configs/monitoring/XULRunner_mozilla1.8.txt

Comment 16

[Daniel Veditz [:dveditz]]

Comment on attachment 280941 [details] [diff] [review]
diff between 2006 and relbranch

ah, this was before the version bumps which were a separate attachment

yeah, that's all good.
r=dveditz

Comment 17

[Robert Helmer [:rhelmer]]

Attachment: diffs between 2006 and 2007

Looks like there is a bug in the way we handle tagging from the relbranch after we've done an RC on the 1.8 branch:

1) pull 1.8 branch, create relbranch, tag _RC2 and _RELEASE
2) pull old relbranch, tag _RC2 and force-tag _RELEASE

The problem with #2 is that it'll leave any new files on the 1.8 branch that don't exist in the old relbranch on the _RELEASE tag, which is what we use to build.

Going to file a separate bug on fixing it, Dan would you mind taking a look at these changes and make sure there's nothing harmful here? Sorry for the hassle :(

Comment 18

[Daniel Veditz [:dveditz]]

Comment on attachment 281215 [details] [diff] [review]
diffs between 2006 and 2007

r=dveditz

All the Firefox changes look good. We won't be affected by new calendar and camino files. The mail and xpfe changes represent Thunderbird 2.0.0.6 and SeaMonkey 1.1.4 versions of the -osint fix that landed after the Firefox 2.0.0.6 build, they won't affect us either.

I don't understand the mozilla/tools/tinderbox-configs file removals, I'll trust you on those.

Comment 19

[J. Paul Reed [:preed]]

(In reply to comment #17)
> Created an attachment (id=281215) [details]
> diffs between 2006 and 2007
> 
> Looks like there is a bug in the way we handle tagging from the relbranch after
> we've done an RC on the 1.8 branch:

This is actually a specific case of the generalized case of a patch on the _RELBRANCH that deletes files. You'd have this same bug in those cases (Bootstrap::Util::GetDiffFilesList() was supposed to address this by having the tag update to the 'dead' state, but this doesn't seem to be happening).

Comment 20

[Robert Helmer [:rhelmer]]

Attachment: 7pre->8pre bump as landed

Included monitoring config and perf tests as per cf:

Checking in browser/app/module.ver;
/cvsroot/mozilla/browser/app/module.ver,v  <--  module.ver
new revision: 1.11.2.19; previous revision: 1.11.2.18
done
Checking in browser/config/version.txt;
/cvsroot/mozilla/browser/config/version.txt,v  <--  version.txt
new revision: 1.4.18.18; previous revision: 1.4.18.17
done
Checking in config/milestone.txt;
/cvsroot/mozilla/config/milestone.txt,v  <--  milestone.txt
new revision: 3.27.2.17; previous revision: 3.27.2.16
done
Checking in tools/tinderbox-configs/monitoring/Firefox_mozilla1.8.txt;
/cvsroot/mozilla/tools/tinderbox-configs/monitoring/Firefox_mozilla1.8.txt,v  <--  Firefox_mozilla1.8.txt
new revision: 1.14; previous revision: 1.13
done
Checking in tools/tinderbox-configs/monitoring/XULRunner_mozilla1.8.txt;
/cvsroot/mozilla/tools/tinderbox-configs/monitoring/XULRunner_mozilla1.8.txt,v  <--  XULRunner_mozilla1.8.txt
new revision: 1.13; previous revision: 1.12
done
Checking in tools/tinderbox-configs/firefox/linux/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.1.10.12; previous revision: 1.1.10.11
done
Checking in tools/tinderbox-configs/firefox/win32/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.2.8.11; previous revision: 1.2.8.10
done

Comment 21

[Robert Helmer [:rhelmer]]

Attachment: provide updates from RC1

This seems to work ok for me, is there a better way?