build mar/mbsdiff from tag, and run updates per platform r=preed b=373080

This commit is contained in:
rhelmer%mozilla.com 2007-03-09 19:57:27 +00:00
parent 6fa6c44ab3
commit 8d36248c77
2 changed files with 16 additions and 4 deletions

View File

@ -61,7 +61,8 @@ sub Execute {
$ENV{'CVSROOT'} = $mozillaCvsroot; $ENV{'CVSROOT'} = $mozillaCvsroot;
$this->Shell( $this->Shell(
cmd => './patcher2.pl', cmd => './patcher2.pl',
cmdArgs => ['--build-tools', '--app=' . $product, cmdArgs => ['--build-tools', '--tools-revision=' . $patcherToolsRev,
'--app=' . $product,
'--config=../config/' . $patcherConfig], '--config=../config/' . $patcherConfig],
logFile => catfile($logDir, 'updates_patcher-build-tools.log'), logFile => catfile($logDir, 'updates_patcher-build-tools.log'),
dir => catfile($versionedUpdateDir, 'patcher'), dir => catfile($versionedUpdateDir, 'patcher'),
@ -107,6 +108,7 @@ sub Verify {
my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot'); my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
my $verifyDir = $config->Get(var => 'verifyDir'); my $verifyDir = $config->Get(var => 'verifyDir');
my $product = $config->Get(var => 'product'); my $product = $config->Get(var => 'product');
my $verifyConfig = $config->Get(var => 'verifyConfig');
# Create verification area. # Create verification area.
my $verifyDirVersion = catfile($verifyDir, $product . '-' . $version); my $verifyDirVersion = catfile($verifyDir, $product . '-' . $version);
@ -126,11 +128,19 @@ sub Verify {
# Customize updates.cfg to contain the channels you are interested in # Customize updates.cfg to contain the channels you are interested in
# testing. # testing.
my $verifyLog = catfile($logDir, 'updates_verify.log');
$this->Shell( $this->Shell(
cmd => './verify.sh', cmd => './verify.sh',
cmdArgs => ['-c'], cmdArgs => ['-c', $verifyConfig],
logFile => catfile($logDir, 'updates_verify.log'), logFile => $verifyLog,
dir => catfile($verifyDirVersion, 'updates'), dir => catfile($verifyDirVersion, 'updates'),
timeout => 36000,
);
$this->CheckLog(
log => $verifyLog,
notAllowed => '^FAIL',
); );
} }

View File

@ -23,5 +23,7 @@ from = Bootstrap <build@example.com>
to = engineer@example.com to = engineer@example.com
cc = interested_users@example.com, others@example.com cc = interested_users@example.com, others@example.com
patcherConfig = moz180-branch-patcher2.cfg patcherConfig = moz180-branch-patcher2.cfg
patcherToolsRev = MOZILLA_1_9a2_RELEASE
verifyConfig = moz180-firefox-linux.cfg
blat = /cygdrive/d/moztools/bin/blat.exe blat = /cygdrive/d/moztools/bin/blat.exe
sendmail = /usr/lib/sendmail sendmail = /usr/lib/sendmail