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

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

mozilla/tools/tinderbox-configs/firefox/linux/CLOBBER

@@ -0,0 +1,2 @@
+Clobbering to pick up changes from bug 409803.
+

mozilla/tools/tinderbox-configs/firefox/linux/mozconfig

@@ -0,0 +1,27 @@
+#
+## hostname: fx-linux-tbox
+## uname: Linux fx-linux-tbox.build.mozilla.org 2.6.18-8.el5 #1 SMP Thu Mar 15 19:57:35 EDT 2007 i686 i686 i386 GNU/Linux
+#
+
+export CFLAGS="-gstabs+"
+export CXXFLAGS="-gstabs+"
+
+mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
+mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging mozilla/tools/codesighs"
+ac_add_options --enable-application=browser
+
+ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-packaging
+
+# Don't add explicit optimize flags here, set them in configure.in, see bug 407794.
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+#not yet
+#ac_add_options --enable-glitz
+
+ac_add_options --enable-codesighs
+
+CC=/tools/gcc/bin/gcc
+CXX=/tools/gcc/bin/g++

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

@@ -0,0 +1,269 @@
+#
+## hostname: fx-linux-tbox
+## uname: Linux fx-linux-tbox.build.mozilla.org 2.6.18-8.el5 #1 SMP Thu Mar 15 19:57:35 EDT 2007 i686 i686 i386 GNU/Linux
+#
+
+#- tinder-config.pl - Tinderbox configuration file.
+#-    Uncomment the variables you need to set.
+#-    The default values are the same as the commented variables.
+
+$ENV{CVS_RSH} = "ssh";
+$ENV{MOZ_CRASHREPORTER_NO_REPORT} = '1';
+
+# To ensure Talkback client builds properly on some Linux boxen where LANG
+# is set to "en_US.UTF-8" by default, override that setting here by setting
+# it to "en_US.iso885915" (the setting on ocean).  Proper fix is to update
+# where xrestool is called in the build system so that 'LANG=C' in its
+# environment, according to bryner.
+$ENV{LANG} = "en_US.iso885915";
+
+# $ENV{MOZ_PACKAGE_MSI}
+#-----------------------------------------------------------------------------
+#  Default: 0
+#   Values: 0 | 1
+#  Purpose: Controls whether a MSI package is made.
+# Requires: Windows and a local MakeMSI installation.
+#$ENV{MOZ_PACKAGE_MSI} = 0;
+
+# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
+#-----------------------------------------------------------------------------
+#  Default: scp
+#   Values: scp | rsync
+#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
+# Requires: The selected type requires the command be available both locally
+#           and on the Talkback server.
+#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
+
+#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+$BuildAdministrator = 'build@mozilla.org';
+#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
+#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+
+#- You'll need to change these to suit your machine's needs
+$DisplayServer = ':0.0';
+
+#- Default values of command-line opts
+#-
+#$BuildDepend       = 1;      # Depend or Clobber
+#$BuildDebug        = 0;      # Debug or Opt (Darwin)
+#$ReportStatus      = 1;      # Send results to server, or not
+#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
+#$UseTimeStamp      = 1;      # Use the CVS 'pull-by-timestamp' option, or not
+#$BuildOnce         = 0;      # Build once, don't send results to server
+#$TestOnly          = 0;      # Only run tests, don't pull/build
+#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
+#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
+#$BuildLocales      = 0;      # Do l10n packaging?
+
+# Tests
+$CleanProfile             = 1;
+#$ResetHomeDirForTests     = 1;
+$ProductName              = "Firefox";
+$VendorName               = 'Mozilla';
+
+# CONFIG: $RunMozillaTests          = %runMozillaTests%;
+$RunMozillaTests          = 1;
+$RegxpcomTest             = 1;
+$AliveTest                = 1;
+#$JavaTest                 = 0;
+#$ViewerTest               = 0;
+#$BloatTest                = 0;  # warren memory bloat test
+#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
+#$DomToTextConversionTest  = 0;  
+#$XpcomGlueTest            = 0;
+$CodesizeTest             = 1;  # Z,  require mozilla/tools/codesighs
+$EmbedCodesizeTest        = 1;  # mZ, require mozilla/tools/codesigns
+#$MailBloatTest            = 0;
+#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
+$LayoutPerformanceTest    = 0;  # Tp
+$DHTMLPerformanceTest     = 0;  # Tdhtml
+#$QATest                   = 0;  
+#$XULWindowOpenTest        = 0;  # Txul
+$StartupPerformanceTest   = 0;  # Ts
+
+$TestsPhoneHome           = 0;  # Should test report back to server?
+$GraphNameOverride        = 'fx-linux-tbox';
+
+# $results_server
+#----------------------------------------------------------------------------
+# Server on which test results will be accessible.  This was originally tegu,
+# then became axolotl.  Once we moved services from axolotl, it was time
+# to give this service its own hostname to make future transitions easier.
+# - cmp@mozilla.org
+#$results_server           = "build-graphs.mozilla.org";
+
+#$pageload_server          = "spider";  # localhost
+$pageload_server      = "pageload.build.mozilla.org";
+
+
+#
+# Timeouts, values are in seconds.
+#
+#$CVSCheckoutTimeout               = 3600;
+#$CreateProfileTimeout             = 45;
+#$RegxpcomTestTimeout              = 120;
+
+#$AliveTestTimeout                 = 45;
+#$ViewerTestTimeout                = 45;
+#$EmbedTestTimeout                 = 45;
+#$BloatTestTimeout                 = 120;   # seconds
+#$MailBloatTestTimeout             = 120;   # seconds
+#$JavaTestTimeout                  = 45;
+#$DomTestTimeout	                  = 45;    # seconds
+#$XpcomGlueTestTimeout             = 15;
+#$CodesizeTestTimeout              = 900;     # seconds
+#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
+#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
+#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
+#$QATestTimeout                    = 1200;   # entire test, seconds
+#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
+#$StartupPerformanceTestTimeout    = 15;    # seconds
+#$XULWindowOpenTestTimeout	      = 150;   # seconds
+
+
+#$MozConfigFileName = 'mozconfig';
+
+#$UseMozillaProfile = 1;
+#$MozProfileName = 'default';
+
+#- Set these to what makes sense for your system
+#$Make          = 'gmake';       # Must be GNU make
+#$MakeOverrides = '';
+#$mail          = '/bin/mail';
+#$CVS           = 'cvs -q';
+#$CVSCO         = 'checkout -P';
+
+# win32 usually doesn't have /bin/mail
+#$blat           = 'c:/nstools/bin/blat';
+#$use_blat       = 0;
+
+# Set moz_cvsroot to something like:
+# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
+# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
+#
+# Note that win32 may not need \@, depends on ' or ".
+# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
+
+#$moz_cvsroot   = $ENV{CVSROOT};
+# CONFIG: $moz_cvsroot   = '%mozillaCvsroot%';
+$moz_cvsroot   = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
+
+#- Set these proper values for your tinderbox server
+#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
+
+# Allow for non-client builds, e.g. camino.
+#$moz_client_mk = 'client.mk';
+
+#- Set if you want to build in a separate object tree
+$ObjDir = 'obj-fx-trunk';
+
+# Extra build name, if needed.
+$BuildNameExtra = 'Nightly';
+
+# User comment, eg. ip address for dhcp builds.
+# ex: $UserComment = "ip = 208.12.36.108";
+#$UserComment = 0;
+
+#-
+#- The rest should not need to be changed
+#-
+
+#- Minimum wait period from start of build to start of next build in minutes.
+#$BuildSleep = 10;
+
+#- Until you get the script working. When it works,
+#- change to the tree you're actually building
+# CONFIG: $BuildTree  = '%buildTree%';
+$BuildTree  = 'MozillaTest';
+
+#$BuildName = '';
+#$BuildTag = '';
+#$BuildConfigDir = 'mozilla/config';
+#$Topsrcdir = 'mozilla';
+
+$BinaryName = 'firefox-bin';
+
+#
+# For embedding app, use:
+#$EmbedBinaryName = 'TestGtkEmbed';
+#$EmbedDistDir    = 'dist/bin'
+
+
+#$ShellOverride = ''; # Only used if the default shell is too stupid
+#$ConfigureArgs = '';
+#$ConfigureEnvArgs = '';
+#$Compiler = 'gcc';
+#$NSPRArgs = '';
+#$ShellOverride = '';
+
+# Release build options
+$ReleaseBuild  = 1;
+$shiptalkback  = 0;
+$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = 14;
+$package_creation_path = "/browser/installer";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
+# CONFIG: $ssh_user      = "%sshUser%";
+$ssh_user      = "ffxbld";
+$ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
+# CONFIG: $ssh_server    = "%sshServer%";
+$ssh_server    = "stage-old.mozilla.org";
+$ReleaseGroup  = "firefox";
+$ftp_path      = "/home/ftp/pub/firefox/nightly/experimental";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/experimental";
+$tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
+$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
+$milestone     = "trunk";
+$notify_list   = 'build-announce@mozilla.org';
+$stub_installer = 0;
+$sea_installer = 0;
+$archive       = 1;
+$push_raw_xpis = 0;
+# CONFIG: $update_aus_host = '%ausServer%';
+$update_aus_host = 'aus2-staging.mozilla.org';
+$update_pushinfo = 0;
+$update_package = 1;
+$update_product = "Firefox";
+$update_version = "trunk";
+$update_platform = "Linux_x86-gcc3";
+$update_hash = "sha1";
+# 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';
+# CONFIG: $ENV{'SYMBOL_SERVER_USER'}    = '%symbolServerUser%';
+$ENV{'SYMBOL_SERVER_USER'}    = 'ffxbld';
+# CONFIG: $ENV{'SYMBOL_SERVER_PATH'}    = '%symbolServerPath%';
+$ENV{'SYMBOL_SERVER_PATH'}    = '/mnt/netapp/breakpad/symbols_ffx';
+# CONFIG: $ENV{'SYMBOL_SERVER_SSH_KEY'} = '%symbolServerKey%';
+$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
+# locking up (and testing would be suspect even after a couple of cycles).
+# Right now, there is only code to force the reboot for Win9x, so even
+# setting this to 1, will not have an effect on other platforms. Setting
+# up win9x to automatically logon and begin running tinderbox is left 
+# as an exercise to the reader. 
+#$RebootSystem = 0;
+
+# LogCompression specifies the type of compression used on the log file.
+# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
+# for 'gzip' or 'bzip2' are in the user's path before setting this
+# option.
+#$LogCompression = '';
+
+# LogEncoding specifies the encoding format used for the logs. Valid
+# options are 'base64', and 'uuencode'. If $LogCompression is set above,
+# this needs to be set to 'base64' or 'uuencode' to ensure that the
+# binary data is transferred properly.
+#$LogEncoding = '';
+
+# Prevent Extension Manager from spawning child processes during tests
+# - processes that tbox scripts cannot kill. 
+#$ENV{NO_EM_RESTART} = '1';

mozilla/tools/tinderbox-configs/firefox/macosx/CLOBBER

@@ -0,0 +1 @@
+trigger a nightly to push the fix to bug 421841 to users

mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig

@@ -1,17 +1,14 @@
 #
-## hostname: bm-xserve16.build.mozilla.org
-## uname: Darwin bm-xserve16.local 9.2.0 Darwin Kernel Version 9.2.0: Tue Feb  5 16:13:22 PST 2008; root:xnu-1228.3.13~1/RELEASE_I386 i386
+## hostname: bm-xserve08.build.mozilla.org
+## uname: Darwin bm-xserve08.build.mozilla.org 8.8.4 Darwin Kernel Version 8.8.4: Sun Oct 29 15:26:54 PST 2006; root:xnu-792.16.4.obj~1/RELEASE_I386 i386 i386
 #
 
+# symbols for breakpad
+export CFLAGS="-g -gfull"
+export CXXFLAGS="-g -gfull"
+
 . $topsrcdir/build/macosx/universal/mozconfig
 
-# symbols for breakpad, stabs instead of DWARF
-export CFLAGS="-gstabs+ -gfull -save-temps -mmacosx-version-min=10.4"
-export CXXFLAGS="-gstabs+ -gfull -save-temps -mmacosx-version-min=10.4"
-
-ac_add_options --enable-macos-target=10.4
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging mozilla/tools/codesighs"
 mk_add_options MOZ_CO_PROJECT="browser"

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

@@ -1,6 +1,6 @@
 #
-## hostname: bm-xserve16.build.mozilla.org
-## uname: Darwin bm-xserve16.local 9.2.0 Darwin Kernel Version 9.2.0: Tue Feb  5 16:13:22 PST 2008; root:xnu-1228.3.13~1/RELEASE_I386 i386
+## hostname: bm-xserve08.build.mozilla.org
+## uname: Darwin bm-xserve08.build.mozilla.org 8.8.4 Darwin Kernel Version 8.8.4: Sun Oct 29 15:26:54 PST 2006; root:xnu-792.16.4.obj~1/RELEASE_I386 i386 i386
 #
 
 #- tinder-config.pl - Tinderbox configuration file.
@@ -73,16 +73,16 @@ $CodesizeTest             = 1;  # Z,  require mozilla/tools/codesighs
 $EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
 #$MailBloatTest            = 0;
 #$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
-$LayoutPerformanceTest    = 1;  # Tp
-$LayoutPerformanceLocalTest   = 1;  # Tp2
-$DHTMLPerformanceTest     = 1;  # Tdhtml
+$LayoutPerformanceTest    = 0;  # Tp
+$LayoutPerformanceLocalTest   = 0;  # Tp2
+$DHTMLPerformanceTest     = 0;  # Tdhtml
 #$QATest                   = 0;  
-$XULWindowOpenTest        = 1;  # Txul
-$StartupPerformanceTest   = 1;  # Ts
+$XULWindowOpenTest        = 0;  # Txul
+$StartupPerformanceTest   = 0;  # Ts
 
-$TestsPhoneHome           = 1;  # Should test report back to server?
+$TestsPhoneHome           = 0;  # Should test report back to server?
 
-#$GraphNameOverride        = 'xserve08.build.mozilla.org_Fx-Trunk';
+$GraphNameOverride        = 'xserve08.build.mozilla.org_Fx-Trunk';
 
 # $results_server
 #----------------------------------------------------------------------------
@@ -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';
@@ -157,7 +157,7 @@ $moz_cvsroot   = ":ext:ffxbld\@cvs.mozilla.org:/cvsroot";
 $ObjDir = '../build/universal';
 
 # Extra build name, if needed.
-$BuildNameExtra = 'Leopard';
+$BuildNameExtra = 'Universal Nightly';
 
 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -173,7 +173,7 @@ $BuildNameExtra = 'Leopard';
 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
 # CONFIG: $BuildTree  = '%buildTree%';
-$BuildTree  = 'MozillaExperimental';
+$BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
 #$BuildTag = '';
@@ -200,7 +200,7 @@ $ReleaseBuild  = 1;
 $shiptalkback  = 0;
 $ReleaseToLatest = 1; # Push the release to latest-<milestone>?
 $ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-$build_hour    = "3";
+$build_hour    = "14";
 $package_creation_path = "/browser/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $mac_bundle_path = "/browser/app";
@@ -209,10 +209,10 @@ $ssh_version   = "2";
 $ssh_user      = "ffxbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 # CONFIG: $ssh_server    = "%sshServer%";
-$ssh_server    = "stage.mozilla.org";
+$ssh_server    = "stage-old.mozilla.org";
 $ReleaseGroup  = "firefox";
-$ftp_path      = "/home/ftp/pub/firefox/nightly/experimental/leopard";
-$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/leopard";
+$ftp_path      = "/home/ftp/pub/firefox/nightly/experimental";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/experimental";
 $tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
 $tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
 $milestone     = "trunk";
@@ -227,21 +227,21 @@ $update_package = 1;
 $update_product = "Firefox";
 $update_version = "trunk";
 $update_platform = "Darwin_Universal-gcc3";
-$update_hash = "sha1";
-# CONFIG: $update_filehost = '%externalStagingServer%';
-$update_filehost = "ftp.mozilla.org";
+$update_hash = "md5";
+# 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} = 'stage.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/CLOBBER

@@ -1 +1 @@
-backout PGO
+Clobbering to pick up fixes from bug 419319.

mozilla/tools/tinderbox-configs/firefox/win32/mozconfig

@@ -2,13 +2,14 @@
 ## hostname: fx-win32-tbox
 ## uname: MINGW32_NT-5.2 FX-WIN32-TBOX 1.0.11(0.46/3/2) 2007-01-12 12:05 i686 Msys
 #
-export CFLAGS="-GL"
-export CXXFLAGS="-GL"
+export CFLAGS="-GL -wd4624 -wd4952"
+export CXXFLAGS="-GL -wd4624 -wd4952"
 export LDFLAGS="-LTCG"
 
 mk_add_options MOZ_CO_PROJECT=browser
 mk_add_options MOZ_MAKE_FLAGS="-j5"
 mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 
 ac_add_options --enable-application=browser
 ac_add_options --enable-update-channel=nightly
@@ -17,6 +18,3 @@ ac_add_options --disable-debug
 ac_add_options --disable-tests
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
-
-WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
-

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

@@ -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';
@@ -152,7 +152,7 @@ $moz_cvsroot = ':ext:ffxbld@cvs.mozilla.org:/cvsroot';
 $ObjDir = 'obj-fx-trunk';
 
 # Extra build name, if needed.
-$BuildNameExtra = 'PGO';
+$BuildNameExtra = 'Nightly';
 
 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -168,7 +168,7 @@ $BuildNameExtra = 'PGO';
 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
 # CONFIG: $BuildTree  = '%buildTree%';
-$BuildTree  = 'MozillaExperimental';
+$BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
 #$BuildTag = '';
@@ -190,12 +190,13 @@ $BinaryName = 'firefox.exe';
 #$NSPRArgs = '';
 #$ShellOverride = '';
 
+$ProfiledBuild = 1;
 # Release build options
 $ReleaseBuild  = 1;
 $shiptalkback  = 0;
 $ReleaseToLatest = 1; # Push the release to latest-<milestone>?
 $ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-$build_hour    = "4";
+$build_hour    = "14";
 $package_creation_path = "/browser/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
@@ -203,10 +204,10 @@ $ssh_version   = "2";
 $ssh_user      = "ffxbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 # CONFIG: $ssh_server    = "%sshServer%";
-$ssh_server    = "stage.mozilla.org";
+$ssh_server    = "stage-old.mozilla.org";
 $ReleaseGroup  = "firefox";
-$ftp_path      = "/home/ftp/pub/firefox/nightly/experimental/pgo";
-$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/pgo";
+$ftp_path      = "/home/ftp/pub/firefox/nightly/experimental";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/experimental";
 $tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
 $tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
 $milestone     = "trunk";
@@ -222,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 = 0;
+$crashreporter_pushsymbols = 1;
 # CONFIG: $ENV{'SYMBOL_SERVER_HOST'}    = '%symbolServer%';
-$ENV{'SYMBOL_SERVER_HOST'} = 'stage.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