619980 - patcher-config-bump.pl and update-verify-bump.pl need to special case 64-bit platforms

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Description

[[e-mail] (:bhearsum)]

...because Linux and Mac 64-bit are supposed to obey the platform exceptions for their 32-bit counterparts. Without these scripts supporting that, we don't generate updates for ja and ja-JP-mac on these platforms.

Comment 1

[[e-mail] (:bhearsum)]

Will end up being done as part of 600931.

Comment 2

[Rail Aliiev [:rail]]

I doubt that Bug 600931 is going to be landed before Firefox 4.0b9. Reopening and grabbing the bug.

Comment 3

[Rail Aliiev [:rail]]

Attachment: Bootstrap

Comment 4

[Rail Aliiev [:rail]]

Attachment: tools

Comment 5

[Rail Aliiev [:rail]]

Attachment: patcher-configs

This patch allows properly generate updates for ja/linux64. The updated patcher-config-bump.pl should properly handle linux64 after applying the remaining patches. Still testing in staging.

Comment 6

[Rail Aliiev [:rail]]

Attachment: Bootstrap

Typo, s/macos/macosx/.

Comment 7

[Rail Aliiev [:rail]]

Attachment: Bootstrap

Thanks to coop's sharp eyes. :)

> +my %EQUAL_PLATFORMS = ('linux' => ['linux64'], 'osx' => ['osx64']);

We supposed to use shipped-locales platforms here, not buildbot platforms.

We also need a function to map FTP to buildbot platforms (GetFTPToBuildbotPlatformMap), see the next patch.

Comment 8

[Rail Aliiev [:rail]]

Attachment: tools

> -            push(@supportedPatcherPlatforms, $platformMap{$platform});
> +            if (exists $FTPplatformMap{$platformMap{$platform}} &&
> +                grep($FTPplatformMap{$platformMap{$platform}} eq $_, @{$platforms})){
> +                    push(@supportedPatcherPlatforms, $platformMap{$platform});
> +            }

This is to make sure that we don't add platforms listed in shipped-locales, but not supported during the release. For example if we build mac64, mac won't be listed in exceptions.

> $FTPplatformMap{$platformMap{$equal_platform}}
 'mac64'         <- 'macosx64'  <- 'osx64'
 'linux-x86_64'  <- 'linux64'   <- 'linux64'

Converts (pseudo for osx64) shipped-locales platform (used in @{$localeInfo->{$locale}})  to buildbot, then to ftp (used in @{$platforms}) (!).

Comment 9

[Rail Aliiev [:rail]]

Bootstrap changes should be tagged with UPDATE_PACKAGING_R13, btw.

Comment 10

[[e-mail] (:bhearsum)]

Comment on attachment 502503 [details] [diff] [review]
Bootstrap

Landed on _R13:
Checking in Util.pm;
/cvsroot/mozilla/tools/release/Bootstrap/Util.pm,v  <--  Util.pm
new revision: 1.19; previous revision: 1.18
done
ssh-agent[] bhearsum@voot:~/Mozilla/checkouts/tools-mirror/release/Bootstrap$ ssh-agent
SSH_AUTH_SOCK=/tmp/ssh-JSgxN16326/agent.16326; export SSH_AUTH_SOCK;
SSH_AGENT_PID=16327; export SSH_AGENT_PID;
echo Agent pid 16327;
[] bhearsum@voot:~/Mozilla/checkouts/tools-mirror/release/Bootstrap$ cvs tag UPDATE_PACKAGING_R13 Util.pm
Enter passphrase for key '/home/bhearsum/.ssh/id_dsa': 
W Util.pm : UPDATE_PACKAGING_R13 already exists on version 1.18 : NOT MOVING tag to version 1.19
[] bhearsum@voot:~/Mozilla/checkouts/tools-mirror/release/Bootstrap$ cvs tag -F UPDATE_PACKAGING_R13 Util.pm
Enter passphrase for key '/home/bhearsum/.ssh/id_dsa': 
T Util.pm

And on _R11_1:
Checking in Util.pm;
/cvsroot/mozilla/tools/release/Bootstrap/Util.pm,v  <--  Util.pm
new revision: 1.18.2.1; previous revision: 1.18
done
[] bhearsum@voot:~/Mozilla/checkouts/tools-mirror/release/Bootstrap$ cvs tag UPDATE_PACKAGING_R11_1 Util.pm
Enter passphrase for key '/home/bhearsum/.ssh/id_dsa': 
W Util.pm : UPDATE_PACKAGING_R11_1 already exists on version 1.18 : NOT MOVING tag to version 1.18.2.1
[] bhearsum@voot:~/Mozilla/checkouts/tools-mirror/release/Bootstrap$ cvs tag -F UPDATE_PACKAGING_R11_1 Util.pm
Enter passphrase for key '/home/bhearsum/.ssh/id_dsa': 
T Util.pm

Comment 11

[Rail Aliiev [:rail]]

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

http://hg.mozilla.org/build/tools/rev/e1b38c981a63

Comment 12

[[e-mail] (:bhearsum)]

Comment on attachment 501987 [details] [diff] [review]
patcher-configs

Checking in moz20-branch-patcher2.cfg;
/cvsroot/mozilla/tools/patcher-configs/moz20-branch-patcher2.cfg,v  <--  moz20-branch-patcher2.cfg
new revision: 1.13; previous revision: 1.12
done

Comment 13

[Rail Aliiev [:rail]]

Silly typo in Bootstrap/Util.pm:

-                    GetFTPToBuildbotiPlatformMap);
+                    GetFTPToBuildbotPlatformMap);

To get updates working asap, I had to fix this w/o a review and commited to CVS using cltbld. Tags have been also updated.

Comment 14

[Rail Aliiev [:rail]]

All done here.