use ausServerUrl instead of externalAusServer to make staging work b=407177 r=bhearsum
git-svn-id: svn://10.0.0.236/trunk@240634 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
79cc79dcbf
commit
f3f2be8a93
@ -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 $externalAusServer = $config->Get(var => 'externalAusServer');
|
||||
my $ausServerUrl = $config->Get(var => 'ausServerUrl');
|
||||
my $externalStagingServer = $config->Get(var => 'externalStagingServer');
|
||||
my $verifyConfig = $config->Get(sysvar => 'verifyConfig');
|
||||
my $logDir = $config->Get(sysvar => 'logDir');
|
||||
@ -318,7 +318,7 @@ sub BumpVerifyConfig {
|
||||
'" locales="' . join(' ', sort(@locales)) . '" channel="' .
|
||||
$channel . '" from="/' . $product . '/releases/' .
|
||||
$oldVersion . '/' . $ftpOsname . '/%locale%/' . $releaseFile .
|
||||
'" aus_server="https://' . $externalAusServer . '" ftp_server="' .
|
||||
'" aus_server="' . $ausServerUrl . '" ftp_server="' .
|
||||
$externalStagingServer . '/pub/mozilla.org" to="/' .
|
||||
$product . '/nightly/' . $version . '-candidates/rc' .
|
||||
$rc . '/' . $nightlyFile . '"' . "\n");
|
||||
|
||||
@ -57,7 +57,7 @@ dumpLogs = 1
|
||||
# username and server to push update snippets to
|
||||
ausUser = cltbld
|
||||
ausServer = aus2-staging.mozilla.org
|
||||
externalAusServer = aus2.mozilla.org
|
||||
ausServerUrl = https://aus2.mozilla.org
|
||||
# Tinderbox server tree that clients should report to
|
||||
buildTree = MozillaRelease
|
||||
# where QA updates/builds go
|
||||
|
||||
@ -57,7 +57,7 @@ dumpLogs = 1
|
||||
# username and server to push update snippets to
|
||||
ausUser = cltbld
|
||||
ausServer = staging-build-console.build.mozilla.org
|
||||
externalAusServer = staging-build-console.build.mozilla.org
|
||||
ausServerUrl = http://staging-build-console.build.mozilla.org
|
||||
buildTree = MozillaTest
|
||||
# where QA updates/builds go
|
||||
stagingUser = cltbld
|
||||
|
||||
@ -58,7 +58,7 @@ sshServer = stage.mozilla.org
|
||||
# username and server to push update snippets
|
||||
ausUser = cltbld
|
||||
ausServer = aus2-staging.mozilla.org
|
||||
externalAusServer = aus2.mozilla.org
|
||||
ausServerUrl = https://aus2.mozilla.org
|
||||
# force 1.8 specific behavior
|
||||
useTalkback = 1
|
||||
useTarGz = 1
|
||||
|
||||
@ -64,7 +64,7 @@ symbolServerKey = /home/cltbld/.ssh/ffxbld_dsa
|
||||
# username and server to push update snippets to
|
||||
ausUser = cltbld
|
||||
ausServer = aus2-staging.mozilla.org
|
||||
externalAusServer = aus2.mozilla.org
|
||||
ausServerUrl = https://aus2.mozilla.org
|
||||
buildTree = MozillaRelease
|
||||
# where QA updates/builds go
|
||||
stagingUser = cltbld
|
||||
|
||||
@ -51,7 +51,7 @@ dumpLogs = 1
|
||||
# username and server to push update snippets to
|
||||
ausUser = cltbld
|
||||
ausServer = aus2-staging.mozilla.org
|
||||
externalAusServer = aus2.mozilla.org
|
||||
ausServerUrl = https://aus2.mozilla.org
|
||||
# Tinderbox server tree that clients should report to
|
||||
buildTree = MozillaRelease
|
||||
# where QA updates/builds go
|
||||
|
||||
@ -57,7 +57,7 @@ sshServer = stage.mozilla.org
|
||||
# username and server to push update snippets
|
||||
ausUser = cltbld
|
||||
ausServer = aus2-staging.mozilla.org
|
||||
externalAusServer = aus2.mozilla.org
|
||||
ausServerUrl = https://aus2.mozilla.org
|
||||
# force 1.8 specific behavior
|
||||
useTalkback = 1
|
||||
useTarGz = 1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user