Bug 391056 - "Swap to SQLite-based pageload server (take three)" [p=reed r=BuildTeam]

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

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

@@ -0,0 +1,29 @@
+#
+## hostname: xserve03.build.mozilla.org
+## uname: Darwin xserve03.build.mozilla.org 8.1.0 Darwin Kernel Version 8.1.0: Tue May 10 18:16:08 PDT 2005; root:xnu-792.1.5.obj~4/RELEASE_PPC Power Macintosh powerpc
+#
+
+. $topsrcdir/build/macosx/universal/mozconfig
+
+mk_add_options MOZ_MAKE_FLAGS="-j4"
+# mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
+mk_add_options MOZ_CO_PROJECT="browser"
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal
+
+ac_add_options --enable-application=browser
+ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-optimize="-O2 -g"
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+# ac_add_options --enable-update-packaging
+
+ac_add_options --enable-static
+ac_add_options --disable-shared
+# ac_add_options --enable-official-branding
+ac_add_app_options ppc --enable-prebinding
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
+
+ac_add_app_options ppc  --with-macos-sdk=/Developer/SDKs/MacOSX10.3.9.sdk
+
+ac_add_options --enable-default-toolkit="cairo-cocoa"

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

@@ -0,0 +1,27 @@
+#
+## hostname: xserve03.build.mozilla.org
+## uname: Darwin xserve03.build.mozilla.org 8.1.0 Darwin Kernel Version 8.1.0: Tue May 10 18:16:08 PDT 2005; root:xnu-792.1.5.obj~4/RELEASE_PPC Power Macintosh powerpc
+#
+
+. $topsrcdir/build/macosx/universal/mozconfig
+
+mk_add_options MOZ_MAKE_FLAGS="-j4"
+mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
+mk_add_options MOZ_CO_PROJECT="browser"
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal
+
+ac_add_options --enable-application=browser
+ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-optimize="-O2 -g"
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --enable-update-packaging
+
+ac_add_options --enable-static
+ac_add_options --disable-shared
+# ac_add_options --enable-official-branding
+ac_add_app_options ppc --enable-prebinding
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
+
+ac_add_options --enable-default-toolkit="cocoa"

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

@@ -1,18 +1,20 @@
 #
-### hostname: bl-bldlnx03.office.mozilla.org
-### uname: Linux bl-bldlnx03.office.mozilla.org 2.6.18-1.2798.fc6 #1 SMP Mon Oct 16 14:54:20 EDT 2006 i686 i686 i386 GNU/Linux
-##
+## hostname: xserve03.build.mozilla.org
+## uname: Darwin xserve03.build.mozilla.org 8.1.0 Darwin Kernel Version 8.1.0: Tue May 10 18:16:08 PDT 2005; root:xnu-792.1.5.obj~4/RELEASE_PPC Power Macintosh powerpc
 #
+
 #- tinder-config.pl - Tinderbox configuration file.
 #-    Uncomment the variables you need to set.
 #-    The default values are the same as the commented variables.
 
-# $ENV{XPCOM_CC_DO_NOTHING}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Turn graydon's cycle collector on/off
-#$ENV{XPCOM_CC_DO_NOTHING} = 0;
+$ENV{NO_EM_RESTART} = "1";
+$ENV{DYLD_NO_FIX_PREBINDING} = "1";
+$ENV{LD_PREBIND_ALLOW_OVERLAP} = "1";
+$ENV{CVS_RSH} = "ssh";
+
+$MacUniversalBinary = 1;
+
+$BuildXForms = 1;
 
 # $ENV{MOZ_PACKAGE_MSI}
 #-----------------------------------------------------------------------------
@@ -32,6 +34,7 @@
 #$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");
 
@@ -46,21 +49,20 @@
 #$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          = 1;      # Only run tests, don't pull/build
+#$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.
-#$SkipCheckout      = 0;      # Use to debug build process without checking out new source.
 #$BuildLocales      = 0;      # Do l10n packaging?
 
 # Tests
 $CleanProfile             = 1;
 #$ResetHomeDirForTests     = 1;
-#$ProductName              = "Mozilla";
-$VendorName               = 'mozilla';
+$ProductName              = 'Minefield';
+$VendorName               = "";
 
 #$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
-$RegxpcomTest             = 1;
-$AliveTest                = 1;
+#$RegxpcomTest             = 1;
+#$AliveTest                = 1;
 #$JavaTest                 = 0;
 #$ViewerTest               = 0;
 #$BloatTest                = 0;  # warren memory bloat test
@@ -72,23 +74,13 @@ $EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
 #$MailBloatTest            = 0;
 #$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
 $LayoutPerformanceTest    = 1;  # Tp
-$LayoutPerformanceLocalTest   = 1;  # Tp
 $DHTMLPerformanceTest     = 1;  # Tdhtml
 #$QATest                   = 0;  
 $XULWindowOpenTest        = 1;  # Txul
 $StartupPerformanceTest   = 1;  # Ts
 
 $TestsPhoneHome           = 1;  # Should test report back to server?
-$TestOnlyTinderbox = 1;
-$DownloadBuildFile = 'firefox-3.0a7pre.en-US.linux-i686.tar.bz2';
-$DownloadBuildURL = 'http://stage.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/fx-linux-tbox-trunk';
-$DownloadBuildDir = 'firefox';
-
-# If TestOnlyTinderbox is enabled, fetch the latest build info from tinderbox in a 
-# parseable format
-$TinderboxServerURL = 'http://tinderbox.mozilla.org/showbuilds.cgi?tree=Firefox&quickparse=1';
-$MatchBuildname = 'Linux fx-linux-tbox Depend Nightly';
-$GraphNameOverride        = "bl-bldlnx03_fx-linux-tbox-HEAD"; # Override name built from ::hostname() and $BuildTag
+$GraphNameOverride        = 'xserve06.build.mozilla.org_Fx-Trunk-Cairo-Cocoa';
 
 # $results_server
 #----------------------------------------------------------------------------
@@ -98,7 +90,8 @@ $GraphNameOverride        = "bl-bldlnx03_fx-linux-tbox-HEAD"; # Override name bu
 # - cmp@mozilla.org
 #$results_server           = "build-graphs.mozilla.org";
 
-$pageload_server          = "spider.office.mozilla.org";
+#$pageload_server          = "spider";  # localhost
+$pageload_server          = "pageload.build.mozilla.org";
 
 #
 # Timeouts, values are in seconds.
@@ -107,7 +100,7 @@ $pageload_server          = "spider.office.mozilla.org";
 #$CreateProfileTimeout             = 45;
 #$RegxpcomTestTimeout              = 120;
 
-$AliveTestTimeout                 = 5;
+#$AliveTestTimeout                 = 45;
 #$ViewerTestTimeout                = 45;
 #$EmbedTestTimeout                 = 45;
 #$BloatTestTimeout                 = 120;   # seconds
@@ -118,7 +111,6 @@ $AliveTestTimeout                 = 5;
 #$CodesizeTestTimeout              = 900;     # seconds
 #$CodesizeTestType                 = "auto";  # {"auto"|"base"}
 #$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
-#$LayoutPerformanceLocalTestTimeout     = 1200;  # entire test, seconds
 #$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
 #$QATestTimeout                    = 1200;   # entire test, seconds
 #$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
@@ -150,6 +142,8 @@ $AliveTestTimeout                 = 5;
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
 
 #$moz_cvsroot   = $ENV{CVSROOT};
+$moz_cvsroot   = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
+#$moz_cvsroot   = "/builds/cvs.hourly/cvsroot";
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -158,10 +152,10 @@ $AliveTestTimeout                 = 5;
 #$moz_client_mk = 'client.mk';
 
 #- Set if you want to build in a separate object tree
-#$ObjDir = '';
+$ObjDir = '../build/universal';
 
 # Extra build name, if needed.
-$BuildNameExtra = "fx-linux-tbox perf test";
+$BuildNameExtra = 'Cairo-Cocoa';
 
 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -172,13 +166,14 @@ $BuildNameExtra = "fx-linux-tbox perf test";
 #-
 
 #- Minimum wait period from start of build to start of next build in minutes.
-$BuildSleep = 1;
+#$BuildSleep = 10;
 
 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'MozillaExperimental';
+$BuildTree  = 'Firefox-Cairo';
 
-$BuildTag = 'HEAD';
+#$BuildName = '';
+#$BuildTag = '';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
@@ -198,29 +193,36 @@ $BinaryName = 'firefox-bin';
 #$ShellOverride = '';
 
 # Release build options
-#$ReleaseBuild  = 1;
-#$clean_objdir = 1; # remove objdir when starting release cycle?
-#$clean_srcdir = 1; # remove srcdir when starting release cycle?
-#$shiptalkback  = 1;
-#$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-#$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-#$ReleaseGroup = ''; # group to set uploaded files to
-#$build_hour    = "8";
-#$package_creation_path = "/xpinstall/packager";
+$ReleaseBuild  = 1;
+$shiptalkback  = 1;
+$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = "4";
+$package_creation_path = "/browser/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
-#$ssh_version   = "2";
+$mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
 #$ssh_user      = "cltbld";
 #$ssh_server    = "stage.mozilla.org";
-#$ftp_path      = "/home/ftp/pub/mozilla/nightly/experimental";
-#$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/experimental";
-#$tbox_ftp_path = $ftp_path;
-#$tbox_url_path = $url_path;
-#$milestone     = "trunk";
-#$notify_list   = "cmp\@mozilla.org";
-#$stub_installer = 1;
-#$sea_installer = 1;
-#$archive       = 0;
-#$push_raw_xpis = 1;
+$ftp_path      = "/home/ftp/pub/firefox/nightly/experimental/cairo-cocoa";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/cairo-cocoa";
+$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;
+#$update_package = 1;
+#$update_product = "Firefox";
+#$update_version = "trunk";
+#$update_platform = "Darwin_ppc-gcc3";
+#$update_hash = "md5";
+#$update_filehost = "ftp.mozilla.org";
+#$update_appv = "3.0a1";
+#$update_extv = "3.0a1";
+#$update_pushinfo = 1;
 
 # 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-cocoa

@@ -1,18 +1,20 @@
 #
-#### hostname: bl-bldxp01.office.mozilla.org
-#### uname: CYGWIN_NT-5.1 bl-bldxp01 1.5.19(0.150/4/2) 2006-01-20 13:28 i686 Cygwin
-###
+## hostname: xserve03.build.mozilla.org
+## uname: Darwin xserve03.build.mozilla.org 8.1.0 Darwin Kernel Version 8.1.0: Tue May 10 18:16:08 PDT 2005; root:xnu-792.1.5.obj~4/RELEASE_PPC Power Macintosh powerpc
 #
+
 #- tinder-config.pl - Tinderbox configuration file.
 #-    Uncomment the variables you need to set.
 #-    The default values are the same as the commented variables.
 
-# $ENV{XPCOM_CC_DO_NOTHING}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Turn graydon's cycle collector on/off
-#$ENV{XPCOM_CC_DO_NOTHING} = 0;
+$ENV{NO_EM_RESTART} = "1";
+$ENV{DYLD_NO_FIX_PREBINDING} = "1";
+$ENV{LD_PREBIND_ALLOW_OVERLAP} = "1";
+$ENV{CVS_RSH} = "ssh";
+
+$MacUniversalBinary = 1;
+
+$BuildXForms = 1;
 
 # $ENV{MOZ_PACKAGE_MSI}
 #-----------------------------------------------------------------------------
@@ -32,6 +34,7 @@
 #$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");
 
@@ -46,21 +49,20 @@
 #$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          = 1;      # Only run tests, don't pull/build
+#$TestOnly          = 1;      # 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.
-#$SkipCheckout      = 0;      # Use to debug build process without checking out new source.
 #$BuildLocales      = 0;      # Do l10n packaging?
 
 # Tests
 $CleanProfile             = 1;
 #$ResetHomeDirForTests     = 1;
-#$ProductName              = "Mozilla";
-$VendorName               = 'mozilla';
+$ProductName              = 'Minefield';
+$VendorName               = "";
 
 #$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
-$RegxpcomTest             = 0;
-$AliveTest                = 1;
+#$RegxpcomTest             = 1;
+#$AliveTest                = 1;
 #$JavaTest                 = 0;
 #$ViewerTest               = 0;
 #$BloatTest                = 0;  # warren memory bloat test
@@ -72,18 +74,13 @@ $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
 #$QATest                   = 0;  
 $XULWindowOpenTest        = 1;  # Txul
 $StartupPerformanceTest   = 1;  # Ts
 
 $TestsPhoneHome           = 1;  # Should test report back to server?
-# If TestOnlyTinderbox is enabled, fetch the latest build info from tinderbox in a 
-# parseable format
-$TinderboxServerURL = 'http://tinderbox.mozilla.org/showbuilds.cgi?tree=MozillaExperimental&quickparse=1';
-$MatchBuildname = 'WINNT 5.2 fxnewref-win32- Depend Fx-Newref';
-#$GraphNameOverride        = 'Fx-Trunk-win32-test1'; # Override name built from ::hostname() and $BuildTag
+$GraphNameOverride        = 'xserve03.build.mozilla.org_Fx-Trunk-Cocoa;
 
 # $results_server
 #----------------------------------------------------------------------------
@@ -93,7 +90,8 @@ $MatchBuildname = 'WINNT 5.2 fxnewref-win32- Depend Fx-Newref';
 # - cmp@mozilla.org
 #$results_server           = "build-graphs.mozilla.org";
 
-$pageload_server          = "spider.office.mozilla.org";
+#$pageload_server          = "spider";  # localhost
+$pageload_server          = "pageload.build.mozilla.org";
 
 #
 # Timeouts, values are in seconds.
@@ -102,7 +100,7 @@ $pageload_server          = "spider.office.mozilla.org";
 #$CreateProfileTimeout             = 45;
 #$RegxpcomTestTimeout              = 120;
 
-$AliveTestTimeout                 = 45;
+#$AliveTestTimeout                 = 45;
 #$ViewerTestTimeout                = 45;
 #$EmbedTestTimeout                 = 45;
 #$BloatTestTimeout                 = 120;   # seconds
@@ -113,7 +111,6 @@ $AliveTestTimeout                 = 45;
 #$CodesizeTestTimeout              = 900;     # seconds
 #$CodesizeTestType                 = "auto";  # {"auto"|"base"}
 #$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
-#$LayoutPerformanceLocalTestTimeout     = 1200;  # entire test, seconds
 #$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
 #$QATestTimeout                    = 1200;   # entire test, seconds
 #$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
@@ -145,6 +142,8 @@ $AliveTestTimeout                 = 45;
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
 
 #$moz_cvsroot   = $ENV{CVSROOT};
+$moz_cvsroot   = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
+#$moz_cvsroot   = "/builds/cvs.hourly/cvsroot";
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -153,10 +152,10 @@ $AliveTestTimeout                 = 45;
 #$moz_client_mk = 'client.mk';
 
 #- Set if you want to build in a separate object tree
-#$ObjDir = '';
+$ObjDir = '../build/universal';
 
 # Extra build name, if needed.
-$BuildNameExtra = 'fxnewref-win32-tbox perf test';
+$BuildNameExtra = 'Cocoa';
 
 # User comment, eg. ip address for dhcp builds.
 # ex: $UserComment = "ip = 208.12.36.108";
@@ -171,13 +170,14 @@ $BuildNameExtra = 'fxnewref-win32-tbox perf test';
 
 #- Until you get the script working. When it works,
 #- change to the tree you're actually building
-$BuildTree  = 'Firefox';
+$BuildTree  = 'Firefox-Cairo';
 
-$BuildTag = 'HEAD';
+#$BuildName = '';
+#$BuildTag = '';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
-$BinaryName = 'firefox.exe';
+$BinaryName = 'firefox-bin';
 
 #
 # For embedding app, use:
@@ -193,29 +193,36 @@ $BinaryName = 'firefox.exe';
 #$ShellOverride = '';
 
 # Release build options
-#$ReleaseBuild  = 1;
-#$clean_objdir = 1; # remove objdir when starting release cycle?
-#$clean_srcdir = 1; # remove srcdir when starting release cycle?
-#$shiptalkback  = 1;
-#$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-#$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-#$ReleaseGroup = ''; # group to set uploaded files to
-#$build_hour    = "8";
-#$package_creation_path = "/xpinstall/packager";
+$ReleaseBuild  = 1;
+$shiptalkback  = 1;
+$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
+$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
+$build_hour    = "4";
+$package_creation_path = "/browser/installer";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
-#$ssh_version   = "2";
+$mac_bundle_path = "/browser/app";
+$ssh_version   = "2";
 #$ssh_user      = "cltbld";
 #$ssh_server    = "stage.mozilla.org";
-#$ftp_path      = "/home/ftp/pub/mozilla/nightly/experimental";
-#$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/experimental";
-#$tbox_ftp_path = $ftp_path;
-#$tbox_url_path = $url_path;
-#$milestone     = "trunk";
-#$notify_list   = "cmp\@mozilla.org";
-#$stub_installer = 1;
-#$sea_installer = 1;
-#$archive       = 0;
-#$push_raw_xpis = 1;
+$ftp_path      = "/home/ftp/pub/firefox/nightly/experimental/cocoa";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/cocoa";
+$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;
+#$update_package = 1;
+#$update_product = "Firefox";
+#$update_version = "trunk";
+#$update_platform = "Darwin_ppc-gcc3";
+#$update_hash = "md5";
+#$update_filehost = "ftp.mozilla.org";
+#$update_appv = "3.0a1";
+#$update_extv = "3.0a1";
+#$update_pushinfo = 1;
 
 # 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
@@ -241,10 +248,3 @@ $BinaryName = 'firefox.exe';
 # Prevent Extension Manager from spawning child processes during tests
 # - processes that tbox scripts cannot kill. 
 #$ENV{NO_EM_RESTART} = '1';
-# If tinderbox is running in a test-only mode, it needs to be able to download
-# the latest build and unpack it rather than building it.
-$TestOnlyTinderbox = 1;
-$DownloadBuildFile = 'firefox-3.0a8pre.en-US.win32.zip';
-$DownloadBuildURL = 'http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/win32-newref/hourly-builds/latest-trunk';
-$DownloadBuildDir = 'firefox';
-