Bug 401290, add externalAusServer for update verify, r=rhelmer & joduinn

This commit is contained in:
nrthomas@gmail.com 2007-11-14 15:16:30 -08:00
parent acac7afc64
commit 2e224541b0
6 changed files with 19 additions and 11 deletions

View File

@ -228,7 +228,7 @@ sub BumpVerifyConfig {
my $appName = $config->Get(var => 'appName');
my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
my $verifyDir = $config->Get(var => 'verifyDir');
my $ausServer = $config->Get(var => 'ausServer');
my $externalAusServer = $config->Get(var => 'externalAusServer');
my $externalStagingServer = $config->Get(var => 'externalStagingServer');
my $verifyConfig = $config->Get(sysvar => 'verifyConfig');
my $logDir = $config->Get(sysvar => 'logDir');
@ -310,7 +310,7 @@ sub BumpVerifyConfig {
'" locales="' . join(' ', sort(@locales)) . '" channel="' .
$channel . '" from="/' . $product . '/releases/' .
$oldVersion . '/' . $ftpOsname . '/%locale%/' . $releaseFile .
'" aus_server="' . $ausServer . '" ftp_server="' .
'" aus_server="https://' . $externalAusServer . '" ftp_server="' .
$externalStagingServer . '/pub/mozilla.org" to="/' .
$product . '/nightly/' . $version . '-candidates/rc' .
$rc . '/' . $nightlyFile . '"' . "\n");

View File

@ -55,8 +55,9 @@ sendmail = /usr/sbin/sendmail
# dump Log output to stdout
dumpLogs = 1
# username and server to push update snippets to
ausUser = cltbld
ausServer = aus2-staging.mozilla.org
ausUser = cltbld
ausServer = aus2-staging.mozilla.org
externalAusServer = aus2.mozilla.org
# Tinderbox server tree that clients should report to
buildTree = MozillaRelease
# where QA updates/builds go

View File

@ -55,8 +55,9 @@ sendmail = /usr/sbin/sendmail
# dump Log output to stdout
dumpLogs = 1
# username and server to push update snippets to
ausUser = cltbld
ausServer = staging-build-console.build.mozilla.org
ausUser = cltbld
ausServer = staging-build-console.build.mozilla.org
externalAusServer = staging-build-console.build.mozilla.org
buildTree = MozillaTest
# where QA updates/builds go
stagingUser = cltbld

View File

@ -55,3 +55,8 @@ dumpLogs = 1
# username and server to push builds
sshUser = cltbld
sshServer = stage.mozilla.org
# username and server to push update snippets
ausUser = cltbld
ausServer = aus2-staging.mozilla.org
externalAusServer = aus2.mozilla.org

View File

@ -49,8 +49,9 @@ blat = /cygdrive/c/moztools/bin/blat.exe
sendmail = /usr/lib/sendmail
dumpLogs = 1
# username and server to push update snippets to
ausUser = cltbld
ausServer = aus2-staging.mozilla.org
ausUser = cltbld
ausServer = aus2-staging.mozilla.org
externalAusServer = aus2.mozilla.org
# Tinderbox server tree that clients should report to
buildTree = MozillaRelease
# where QA updates/builds go

View File

@ -55,6 +55,6 @@ dumpLogs = 1
sshUser = cltbld
sshServer = stage.mozilla.org
# username and server to push update snippets
ausUser = cltbld
ausServer = aus2-staging.mozilla.org
ausUser = cltbld
ausServer = aus2-staging.mozilla.org
externalAusServer = aus2.mozilla.org