Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SyncNightlyDirToStaging - ssh to stagingServer first, plus better logging b=396438

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@237054 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rhelmer%mozilla.com
2007-10-02 05:21:13 +00:00
parent 01962be880
commit 313dd6ff0a
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/tools/release/Bootstrap/Util.pm
View File

@@ -291,6 +291,8 @@ sub SyncNightlyDirToStaging {
my $productTag = $config->Get(var => 'productTag');
my $rc = $config->Get(var => 'rc');
my $logDir = $config->Get(sysvar => 'logDir');
my $stagingUser = $config->Get(var => 'stagingUser');
my $stagingServer = $config->Get(var => 'stagingServer');
my $externalStagingUser = $config->Get(var => 'externalStagingUser');
my $externalStagingServer = $config->Get(var => 'externalStagingServer');
@@ -298,14 +300,20 @@ sub SyncNightlyDirToStaging {
my $pushLog = catfile($logDir, 'build_' . $rcTag . '-push.log');
my $nightlyDir = $config->GetFtpNightlyDir();
my $command = 'rsync';
my @cmdArgs = ('-av', $nightlyDir, $externalStagingUser.'@'.$externalStagingServer.':'.$nightlyDir);
my $command = 'ssh';
my @cmdArgs = ($stagingUser . '@' . $stagingServer,
'rsync', '-av', $nightlyDir,
$externalStagingUser.'@'.$externalStagingServer.':'.
$nightlyDir);
print 'Bootstrap::Util::SyncNightlyDirToStaging() Running shell command: '.$command.' '.join(' ', @cmdArgs)."\n";
my $rv = RunShellCommand(command => $command,
args => \@cmdArgs,
redirectStderr => 0,
redirectStderr => 1,
logfile => $pushLog);
print 'Bootstrap::Util::SyncNightlyDirToStaging() Output: ' .
$rv->{'output'} . "\n";
if ($rv->{'exitValue'} != 0) {
die "ASSERT: SyncNightlyDirToStaging(): rsync failed\n";
}