diff --git a/mozilla/tools/release/Bootstrap/Step/Updates.pm b/mozilla/tools/release/Bootstrap/Step/Updates.pm index 7ee47434a1d..3479424a754 100644 --- a/mozilla/tools/release/Bootstrap/Step/Updates.pm +++ b/mozilla/tools/release/Bootstrap/Step/Updates.pm @@ -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"); diff --git a/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg index 2ec8ce236dd..a3da513ae64 100644 --- a/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg +++ b/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg @@ -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 diff --git a/mozilla/tools/release/configs/fx-moz18-staging-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz18-staging-bootstrap.cfg index 04b67ea4a9a..c38a9c292d3 100644 --- a/mozilla/tools/release/configs/fx-moz18-staging-bootstrap.cfg +++ b/mozilla/tools/release/configs/fx-moz18-staging-bootstrap.cfg @@ -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 diff --git a/mozilla/tools/release/configs/fx-moz180-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz180-bootstrap.cfg index 4ef4fc0d02d..933f28411a9 100644 --- a/mozilla/tools/release/configs/fx-moz180-bootstrap.cfg +++ b/mozilla/tools/release/configs/fx-moz180-bootstrap.cfg @@ -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 + diff --git a/mozilla/tools/release/configs/tb-moz18-bootstrap.cfg b/mozilla/tools/release/configs/tb-moz18-bootstrap.cfg index 4912913cb39..1a8bbf26ff2 100644 --- a/mozilla/tools/release/configs/tb-moz18-bootstrap.cfg +++ b/mozilla/tools/release/configs/tb-moz18-bootstrap.cfg @@ -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 diff --git a/mozilla/tools/release/configs/tb-moz180-bootstrap.cfg b/mozilla/tools/release/configs/tb-moz180-bootstrap.cfg index 05f40851228..8031e0b9a23 100644 --- a/mozilla/tools/release/configs/tb-moz180-bootstrap.cfg +++ b/mozilla/tools/release/configs/tb-moz180-bootstrap.cfg @@ -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