bustage fix from b=427166, externalStagingServer should now be ftpServer

git-svn-id: svn://10.0.0.236/branches/test@250119 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl

@@ -62,7 +62,7 @@ $ProductName              = "Firefox";
 $VendorName               = 'Mozilla';
 
 # CONFIG: $RunMozillaTests          = %runMozillaTests%;
-$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+$RunMozillaTests          = 1;
 $RegxpcomTest             = 1;
 $AliveTest                = 1;
 #$JavaTest                 = 0;
@@ -146,7 +146,7 @@ $pageload_server      = "pageload.build.mozilla.org";
 
 #$moz_cvsroot   = $ENV{CVSROOT};
 # CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
-$moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
+$moz_cvsroot   = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -174,7 +174,7 @@ $BuildNameExtra = 'Nightly';
 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
 # CONFIG: $BuildTree  = '%buildTree%';
-$BuildTree  = 'Firefox';
+$BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
 #$BuildTag = '';
@@ -229,19 +229,19 @@ $update_product = "Firefox";
 $update_version = "trunk";
 $update_platform = "Linux_x86-gcc3";
 $update_hash = "sha1";
-# CONFIG: $update_filehost = '%externalStagingServer%';
+# CONFIG: $update_filehost = '%ftpServer%';
 $update_filehost = 'ftp.mozilla.org';
 $update_ver_file = 'browser/config/version.txt';
 $crashreporter_buildsymbols = 1;
 $crashreporter_pushsymbols = 1;
 # CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
-$ENV{'SYMBOL_SERVER_HOST'} = 'dm-symbolpush01.mozilla.org';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'dm-symbolpush01.mozilla.org';
 # CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
-$ENV{'SYMBOL_SERVER_USER'}   = 'ffxbld';
+$ENV{'SYMBOL_SERVER_USER'}    = 'ffxbld';
 # CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
-$ENV{'SYMBOL_SERVER_PATH'}   = '/mnt/netapp/breakpad/symbols_ffx/';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_ffx';
 # CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
-$ENV{'SYMBOL_SERVER_SSH_KEY'}   = "$ENV{'HOME'}/.ssh/ffxbld_dsa";
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/home/cltbld/.ssh/ffxbld_dsa';
 
 # Reboot the OS at the end of build-and-test cycle. This is primarily
 # intended for Win9x, which can't last more than a few cycles before

mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl

@@ -59,8 +59,8 @@ $CleanProfile             = 1;
 $ProductName              = 'Minefield';
 $VendorName               = "";
 
-# CONFIG : $RunMozillaTests          = %runMozillaTests%;
-$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+# CONFIG: $RunMozillaTests          = %runMozillaTests%;
+$RunMozillaTests          = 1;
 $RegxpcomTest             = 1;
 $AliveTest                = 1;
 #$JavaTest                 = 0;
@@ -145,7 +145,7 @@ $DHTMLPerformanceTestTimeout      = 180;  # entire test, seconds
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
 
 # CONFIG: $moz_cvsroot = '%mozillaCvsroot%';
-$moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
+$moz_cvsroot = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -173,7 +173,7 @@ $BuildNameExtra = 'Universal Nightly';
 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
 # CONFIG: $BuildTree  = '%buildTree%';
-$BuildTree  = 'Firefox';
+$BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
 #$BuildTag = '';
@@ -227,21 +227,21 @@ $update_package = 1;
 $update_product = "Firefox";
 $update_version = "trunk";
 $update_platform = "Darwin_Universal-gcc3";
-$update_hash = "md5";
-# CONFIG: $update_filehost = '%externalStagingServer%';
-$update_filehost = "ftp.mozilla.org";
+$update_hash = "sha1";
+# CONFIG: $update_filehost = '%ftpServer%';
+$update_filehost = 'ftp.mozilla.org';
 $update_ver_file = 'browser/config/version.txt';
 $update_pushinfo = 0;
 $crashreporter_buildsymbols = 1;
 $crashreporter_pushsymbols = 1;
 # CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
-$ENV{SYMBOL_SERVER_HOST} = 'dm-symbolpush01.mozilla.org';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'dm-symbolpush01.mozilla.org';
 # CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
-$ENV{SYMBOL_SERVER_USER}   = 'ffxbld';
+$ENV{'SYMBOL_SERVER_USER'}    = 'ffxbld';
 # CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
-$ENV{SYMBOL_SERVER_PATH}   = '/mnt/netapp/breakpad/symbols_ffx/';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_ffx';
 # CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
-$ENV{SYMBOL_SERVER_SSH_KEY}   = "$ENV{HOME}/.ssh/ffxbld_dsa";
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/Users/cltbld/.ssh/ffxbld_dsa';
 
 # Reboot the OS at the end of build-and-test cycle. This is primarily
 # intended for Win9x, which can't last more than a few cycles before

mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl

@@ -55,8 +55,8 @@ $CleanProfile             = 1;
 $ProductName              = "Firefox";
 $VendorName               = "Mozilla";
 
-# CONFIG : $RunMozillaTests          = %runMozillaTests%;
-$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
+# CONFIG: $RunMozillaTests          = %runMozillaTests%;
+$RunMozillaTests          = 1;
 $RegxpcomTest             = 1;
 $AliveTest                = 1;
 $JavaTest                 = 0;
@@ -140,7 +140,7 @@ $blat           = '/d/mozilla-build/blat261/full/blat';
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
 
 # CONFIG: $moz_cvsroot = '%mozillaCvsroot%';
-$moz_cvsroot = ':ext:ffxbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -168,7 +168,7 @@ $BuildNameExtra = 'Nightly';
 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
 # CONFIG: $BuildTree  = '%buildTree%';
-$BuildTree  = 'Firefox';
+$BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
 #$BuildTag = '';
@@ -223,20 +223,20 @@ $update_product = "Firefox";
 $update_version = "trunk";
 $update_platform = "WINNT_x86-msvc";
 $update_hash = "sha1";
-# CONFIG: $update_filehost = '%externalStagingServer%';
-$update_filehost = "ftp.mozilla.org";
+# CONFIG: $update_filehost = '%ftpServer%';
+$update_filehost = 'ftp.mozilla.org';
 $update_ver_file = 'browser/config/version.txt';
 $update_pushinfo = 0;
 $crashreporter_buildsymbols = 1;
 $crashreporter_pushsymbols = 1;
 # CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
-$ENV{'SYMBOL_SERVER_HOST'} = 'dm-symbolpush01.mozilla.org';
+$ENV{'SYMBOL_SERVER_HOST'}    = 'dm-symbolpush01.mozilla.org';
 # CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
-$ENV{'SYMBOL_SERVER_USER'}   = 'ffxbld';
+$ENV{'SYMBOL_SERVER_USER'}    = 'ffxbld';
 # CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
-$ENV{'SYMBOL_SERVER_PATH'}   = '/mnt/netapp/breakpad/symbols_ffx/';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_ffx';
 # CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
-$ENV{'SYMBOL_SERVER_SSH_KEY'}   = "$ENV{HOME}/.ssh/ffxbld_dsa";
+$ENV{'SYMBOL_SERVER_SSH_KEY'} = '/c/Documents and Settings/cltbld/.ssh/ffxbld_dsa';
 
 # Reboot the OS at the end of build-and-test cycle. This is primarily
 # intended for Win9x, which can't last more than a few cycles before