From 3897e1b94d73e86a74c5972f0ef06ccdf8e825a6 Mon Sep 17 00:00:00 2001 From: "ccooper%deadsquid.com" Date: Thu, 12 Feb 2009 19:27:33 +0000 Subject: [PATCH] b=451392 r=bhearsum - checkout release tools (l10nverify) from hg rather than CVS - fixup Thunderbird hg repo paths git-svn-id: svn://10.0.0.236/trunk@256206 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/tools/release/Bootstrap/Step.pm | 38 +++++++++++++++++++ .../tools/release/Bootstrap/Step/Repack.pm | 27 ++++++------- .../release/configs/fx-moz19-bootstrap.cfg | 1 + .../configs/fx-moz19-staging-bootstrap.cfg | 1 + .../release/configs/tb-moz19-bootstrap.cfg | 3 +- .../configs/tb-moz19-staging-bootstrap.cfg | 3 +- 6 files changed, 56 insertions(+), 17 deletions(-) diff --git a/mozilla/tools/release/Bootstrap/Step.pm b/mozilla/tools/release/Bootstrap/Step.pm index 4ab7da283f6..94666a91fa1 100644 --- a/mozilla/tools/release/Bootstrap/Step.pm +++ b/mozilla/tools/release/Bootstrap/Step.pm @@ -297,6 +297,11 @@ sub HgClone { (!exists($args{'workDir'})); my $workDir = $args{'workDir'}; + my $tag; + if (exists($args{'tag'})) { + $tag = $args{'tag'}; + } + my $repoDir = catfile($workDir, basename($repo)); if (-e $repoDir) { $this->Log(msg => $repoDir . ' exists, removing it.'); @@ -307,6 +312,39 @@ sub HgClone { cmdArgs => ['clone', $repo], dir => $workDir ); + + if ($tag) { + $this->HgUpdate( + repoDir => $repoDir, + tag => $args{'tag'}, + ) + } +} + +sub HgUpdate { + my $this = shift; + my %args = @_; + + # Required arguments + die "ASSERT: Bootstrap::Step::HgUpdate(): null repoDir" if + (!exists($args{'repoDir'})); + my $repo = $args{'repoDir'}; + + die "ASSERT: Bootstrap::Step::HgUpdate(): repoDir doesn't exist" if + (! -e $repoDir); + + if (!exists($args{'tag'}) or + $args{'tag'} =~ /^default$/i) { + # No need to update if no tag is set or we're using the default + return; + } + my $tag = $args{'tag'}; + + $this->Shell( + cmd => 'hg', + cmdArgs => ['up', '-C', '-r', $tag], + dir => $repoDir + ); } sub HgPush { diff --git a/mozilla/tools/release/Bootstrap/Step/Repack.pm b/mozilla/tools/release/Bootstrap/Step/Repack.pm index 08cfd09d4f4..32406ad0255 100644 --- a/mozilla/tools/release/Bootstrap/Step/Repack.pm +++ b/mozilla/tools/release/Bootstrap/Step/Repack.pm @@ -71,6 +71,8 @@ sub Verify { my $oldVersion = $config->GetOldVersion(longName => 0); my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot'); my $verifyDir = $config->Get(var => 'verifyDir'); + my $hgToolsRepo = $config->Get(var => 'hgToolsRepo'); + my $hgToolsTag = $config->Get(var => 'hgToolsTag'); my $stagingServer = $config->Get(var => 'stagingServer'); my $linuxExtension = $config->GetLinuxExtension(); my $buildTag = $productTag.'_BUILD'.$build; @@ -82,17 +84,12 @@ sub Verify { MkdirWithPath(dir => $verifyDirVersion) or die("Cannot mkdir $verifyDirVersion: $!"); - # check out l10n verification scripts - foreach my $dir ('common', 'l10n') { - $this->CvsCo(cvsroot => $mozillaCvsroot, - checkoutDir => $dir, - modules => [CvsCatfile('mozilla', 'testing', 'release', - $dir)], - workDir => $verifyDirVersion, - logFile => catfile($logDir, - 'repack_checkout-l10n_verification.log') - ); - } + + $this->HgClone( + repo => $hgToolsRepo, + tag => $hgToolsTag, + workDir => $verifyDirVersion + ); # Download current release $this->Shell( @@ -107,7 +104,7 @@ sub Verify { . '/nightly/' . $version . '-candidates/build' . $build . '/*', $product . '-' . $version . '-build' . $build . '/', ], - dir => catfile($verifyDirVersion, 'l10n'), + dir => catfile($verifyDirVersion, 'tools', 'release', 'l10n'), logFile => catfile($logDir, 'repack_verify-download_' . $version . '.log'), timeout => 3600 @@ -127,7 +124,7 @@ sub Verify { . $oldBuild . '/*', $product . '-' . $oldVersion . '-build' . $oldBuild . '/', ], - dir => catfile($verifyDirVersion, 'l10n'), + dir => catfile($verifyDirVersion, 'tools', 'release', 'l10n'), logFile => catfile($logDir, 'repack_verify-download_' . $oldVersion . '.log'), timeout => 3600 @@ -143,7 +140,7 @@ sub Verify { $this->Shell( cmd => './verify_l10n.sh', cmdArgs => [$product], - dir => catfile($verifyDirVersion, 'l10n'), + dir => catfile($verifyDirVersion, 'tools', 'release', 'l10n'), logFile => catfile($logDir, 'repack_' . $product . '-l10n_verification.log'), ); @@ -177,7 +174,7 @@ sub Verify { catfile($oldProduct, 'diffs'), ], ignoreExitValue => 1, - dir => catfile($verifyDirVersion, 'l10n'), + dir => catfile($verifyDirVersion, 'tools', 'release', 'l10n'), logFile => catfile($logDir, 'repack_metadiff-l10n_verification.log'), ); } diff --git a/mozilla/tools/release/configs/fx-moz19-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz19-bootstrap.cfg index d8ddfcd7055..62c6dc8ec80 100644 --- a/mozilla/tools/release/configs/fx-moz19-bootstrap.cfg +++ b/mozilla/tools/release/configs/fx-moz19-bootstrap.cfg @@ -85,6 +85,7 @@ useTalkback = 0 useCvsCompression = 1 useBetaChannel = 1 hgToolsRepo = https://hg.mozilla.org/build/tools +hgToolsTag = default hgUsername = ffxbld win32_hgSshKey = /c/Documents and Settings/cltbld/.ssh/ffxbld_dsa linux_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa diff --git a/mozilla/tools/release/configs/fx-moz19-staging-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz19-staging-bootstrap.cfg index 21a3be8f8dc..d56f28147db 100644 --- a/mozilla/tools/release/configs/fx-moz19-staging-bootstrap.cfg +++ b/mozilla/tools/release/configs/fx-moz19-staging-bootstrap.cfg @@ -85,6 +85,7 @@ useTalkback = 0 useCvsCompression = 1 useBetaChannel = 1 hgToolsRepo = https://hg.mozilla.org/users/stage-ffxbld/tools +hgToolsTag = default hgUsername = stage-ffxbld win32_hgSshKey = /c/Documents and Settings/cltbld/.ssh/ffxbld_dsa linux_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa diff --git a/mozilla/tools/release/configs/tb-moz19-bootstrap.cfg b/mozilla/tools/release/configs/tb-moz19-bootstrap.cfg index 43f993747db..69bd85f7be2 100644 --- a/mozilla/tools/release/configs/tb-moz19-bootstrap.cfg +++ b/mozilla/tools/release/configs/tb-moz19-bootstrap.cfg @@ -84,7 +84,8 @@ sshServer = stage-old.mozilla.org useTalkback = 0 useCvsCompression = 1 useBetaChannel = 0 -hgToolsRepo = hg.mozilla.org/build/tools +hgToolsRepo = https://hg.mozilla.org/build/tools +hgToolsTag = default hgUsername = ffxbld win32_hgSshKey = /c/Documents and Settings/cltbld/.ssh/ffxbld_dsa linux_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa diff --git a/mozilla/tools/release/configs/tb-moz19-staging-bootstrap.cfg b/mozilla/tools/release/configs/tb-moz19-staging-bootstrap.cfg index e77925d19b9..bd4ca7402a4 100644 --- a/mozilla/tools/release/configs/tb-moz19-staging-bootstrap.cfg +++ b/mozilla/tools/release/configs/tb-moz19-staging-bootstrap.cfg @@ -82,7 +82,8 @@ sshServer = fx-linux-1.9-slave1.build.mozilla.org useTalkback = 0 useCvsCompression = 1 useBetaChannel = 0 -hgToolsRepo = hg.mozilla.org/users/stage-ffxbld/tools +hgToolsRepo = https://hg.mozilla.org/users/stage-ffxbld/tools +hgToolsTag = default hgUsername = stage-ffxbld win32_hgSshKey = /c/Documents and Settings/cltbld/.ssh/ffxbld_dsa linux_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa