diff --git a/mozilla/tools/release/Bootstrap/Step/Updates.pm b/mozilla/tools/release/Bootstrap/Step/Updates.pm index d108a658b8b..08c96a389c8 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 $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"); diff --git a/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg index 6f488a2e009..4c67c8855c3 100644 --- a/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg +++ b/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg @@ -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 diff --git a/mozilla/tools/release/configs/fx-moz18-staging-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz18-staging-bootstrap.cfg index 9f553567207..fa881a04016 100644 --- a/mozilla/tools/release/configs/fx-moz18-staging-bootstrap.cfg +++ b/mozilla/tools/release/configs/fx-moz18-staging-bootstrap.cfg @@ -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 diff --git a/mozilla/tools/release/configs/fx-moz180-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz180-bootstrap.cfg index 6a13832a21f..7bd1c6dedfa 100644 --- a/mozilla/tools/release/configs/fx-moz180-bootstrap.cfg +++ b/mozilla/tools/release/configs/fx-moz180-bootstrap.cfg @@ -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 diff --git a/mozilla/tools/release/configs/fx-moz19-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz19-bootstrap.cfg index ec7a2b68933..32d4acb4ed1 100644 --- a/mozilla/tools/release/configs/fx-moz19-bootstrap.cfg +++ b/mozilla/tools/release/configs/fx-moz19-bootstrap.cfg @@ -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 diff --git a/mozilla/tools/release/configs/tb-moz18-bootstrap.cfg b/mozilla/tools/release/configs/tb-moz18-bootstrap.cfg index c95b89efccf..5f0763f4e45 100644 --- a/mozilla/tools/release/configs/tb-moz18-bootstrap.cfg +++ b/mozilla/tools/release/configs/tb-moz18-bootstrap.cfg @@ -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 diff --git a/mozilla/tools/release/configs/tb-moz180-bootstrap.cfg b/mozilla/tools/release/configs/tb-moz180-bootstrap.cfg index 0958481c32e..13c7bea2037 100644 --- a/mozilla/tools/release/configs/tb-moz180-bootstrap.cfg +++ b/mozilla/tools/release/configs/tb-moz180-bootstrap.cfg @@ -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