merge staging to production b=427166 r=nthomas

git-svn-id: svn://10.0.0.236/trunk@249806 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rhelmer%mozilla.com
2008-04-08 16:40:11 +00:00
parent c53c3c422a
commit 0dccbfeda5
13 changed files with 32 additions and 42 deletions

View File

@@ -27,6 +27,7 @@ mofoCvsroot = /builds/cvsmirror/mofo
anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
@@ -57,8 +58,6 @@ buildTree = MozillaTest
# where QA updates/builds go
stagingUser = cltbld
stagingServer = stage.mozilla.org
externalStagingUser = cltbld
externalStagingServer = staging-build-console.build.mozilla.org
# where beta updates/builds go
ftpServer = ftp.mozilla.org
# where release updates/builds go

View File

@@ -30,6 +30,7 @@ mofoCvsroot = cltbld@cvs.mozilla.org:/mofo
anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
@@ -63,16 +64,14 @@ ausServerUrl = https://aus2.mozilla.org
buildTree = MozillaRelease
# where QA updates/builds go
stagingUser = cltbld
stagingServer = production-1.8-master.build.mozilla.org
externalStagingUser = cltbld
externalStagingServer = stage-old.mozilla.org
stagingServer = stage-old.mozilla.org
# where beta updates/builds go
ftpServer = ftp.mozilla.org
# where release updates/builds go
bouncerServer = download.mozilla.org
# username and server to push builds
sshUser = cltbld
sshServer = production-1.8-master.build.mozilla.org
sshServer = stage-old.mozilla.org
# force 1.8 specific behavior
useTalkback = 0
symbolServer = stage-old.mozilla.org

View File

@@ -38,6 +38,7 @@ mofoCvsroot = :ext:cltbld@cvs.mozilla.org:/mofo
anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
@@ -70,8 +71,6 @@ buildTree = Mozilla1.8
# where QA updates/builds go
stagingUser = cltbld
stagingServer = stage-old.mozilla.org
externalStagingUser = cltbld
externalStagingServer = ftp.mozilla.org
# where beta updates/builds go
ftpServer = ftp.mozilla.org
# where release updates/builds go
@@ -80,7 +79,7 @@ bouncerServer = download.mozilla.org
sshUser = ffxbld
sshServer = stage-old.mozilla.org
useTalkback = 0
symbolServer = production-1.8-master.mozilla.org
symbolServer = stage-old.mozilla.org
symbolServerUser = cltbld
symbolServerPath = /data/symbols
symbolServerKey = /home/cltbld/.ssh/id_dsa

View File

@@ -38,6 +38,7 @@ mofoCvsroot = staging-1.8-master.build.mozilla.org:/builds/cvsmirror/mofo
anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
@@ -69,16 +70,14 @@ ausServer = staging-1.8-master.build.mozilla.org
buildTree = Mozilla1.8-Staging
# where QA updates/builds go
stagingUser = cltbld
stagingServer = staging-1.8-master.build.mozilla.org
externalStagingUser = cltbld
externalStagingServer = staging-prometheus-vm.build.mozilla.org
stagingServer = staging-prometheus-vm.build.mozilla.org
# where beta updates/builds go
ftpServer = staging-1.8-master.build.mozilla.org
ftpServer = staging-prometheus-vm.build.mozilla.org
# where release updates/builds go
bouncerServer = staging-1.8-master.build..mozilla.org
bouncerServer = staging-prometheus-vm.build.mozilla.org
# username and server to push builds
sshUser = cltbld
sshServer = staging-1.8-master.build.mozilla.org
sshServer = staging-prometheus-vm.build.mozilla.org
useTalkback = 0
symbolServer = staging-1.8-master.mozilla.org
symbolServerUser = cltbld

View File

@@ -24,13 +24,13 @@ win32_l10n_buildDir = /cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-l10n-Release
linux_logDir = /builds/logs
macosx_logDir = /builds/logs
win32_logDir = /builds/logs
sourceDir = /builds/source
mozillaCvsroot = staging-1.8-master.build.mozilla.org:/builds/cvsmirror/cvsroot
l10nCvsroot = staging-1.8-master.build.mozilla.org:/builds/cvsmirror/l10n
mofoCvsroot = staging-1.8-master.build.mozilla.org:/builds/cvsmirror/mofo
anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags

View File

@@ -32,6 +32,7 @@ mofoCvsroot = cltbld@cvs.mozilla.org:/mofo
anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
@@ -70,15 +71,13 @@ ausServerUrl = https://aus2.mozilla.org
buildTree = MozillaRelease
# where QA updates/builds go
stagingUser = cltbld
stagingServer = production-1.9-master.build.mozilla.org
externalStagingUser = cltbld
externalStagingServer = stage-old.mozilla.org
stagingServer = stage-old.mozilla.org
# where beta updates/builds go
ftpServer = ftp.mozilla.org
# where release updates/builds go
bouncerServer = download.mozilla.org
# username and server to push builds
sshUser = cltbld
sshServer = production-1.9-master.build.mozilla.org
sshServer = stage-old.mozilla.org
useTalkback = 0
useCvsCompression = 1

View File

@@ -36,6 +36,7 @@ mofoCvsroot = :ext:cltbld@cvs.mozilla.org:/mofo
anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
@@ -69,8 +70,6 @@ buildTree = MozillaTest
# where QA updates/builds go
stagingUser = cltbld
stagingServer = stage-old.mozilla.org
externalStagingUser = cltbld
externalStagingServer = ftp.mozilla.org
# where beta updates/builds go
ftpServer = ftp.mozilla.org
# where release updates/builds go

View File

@@ -36,6 +36,7 @@ mofoCvsroot = staging-1.9-master.build.mozilla.org:/builds/cvsmirror/mofo
anonCvsroot = staging-1.9-master.build.mozilla.org:/builds/cvsmirror/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
@@ -68,16 +69,14 @@ ausServerUrl = http://staging-1.9-master.build.mozilla.org
buildTree = Firefox-Staging
# where QA updates/builds go
stagingUser = cltbld
stagingServer = staging-1.9-master.build.mozilla.org
externalStagingUser = cltbld
externalStagingServer = fx-linux-1.9-slave1.build.mozilla.org
stagingServer = fx-linux-1.9-slave1.build.mozilla.org
# where beta updates/builds go
ftpServer = staging-1.9-master.build.mozilla.org
ftpServer = fx-linux-1.9-slave1.build.mozilla.org
# where release updates/builds go
bouncerServer = staging-1.9-master.build.mozilla.org
bouncerServer = fx-linux-1.9-slave1.build.mozilla.org
# username and server to push builds
sshUser = cltbld
sshServer = staging-1.9-master.build.mozilla.org
sshServer = fx-linux-1.9-slave1.build.mozilla.org
useTalkback = 0
# symbol server variables
symbolServer = staging-1.9-master.build.mozilla.org

View File

@@ -26,13 +26,13 @@ win32_l10n_buildDir = /e/fx19l10nrel
linux_logDir = /builds/logs
macosx_logDir = /builds/logs
win32_logDir = /builds/logs
sourceDir = /builds/source
mozillaCvsroot = staging-1.9-master.build.mozilla.org:/builds/cvsmirror/cvsroot
l10nCvsroot = staging-1.9-master.build.mozilla.org:/builds/cvsmirror/l10n
mofoCvsroot = staging-1.9-master.build.mozilla.org:/builds/cvsmirror/mofo
anonCvsroot = staging-1.9-master.build.mozilla.org:/builds/cvsmirror/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags

View File

@@ -25,6 +25,7 @@ l10nCvsroot = :ext:cltbld@cvs.mozilla.org:/l10n
mofoCvsroot = :ext:cltbld@cvs.mozilla.org:/mofo
anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
@@ -55,16 +56,14 @@ ausServerUrl = https://aus2.mozilla.org
buildTree = MozillaRelease
# where QA updates/builds go
stagingUser = cltbld
stagingServer = production-1.8-master.build.mozilla.org
externalStagingUser = cltbld
externalStagingServer = stage-old.mozilla.org
stagingServer = stage-old.mozilla.org
# where beta updates/builds go
ftpServer = ftp.mozilla.org
# where release updates/builds go
bouncerServer = download.mozilla.org
# username and server to push builds
sshUser = cltbld
sshServer = production-1.8-master.build.mozilla.org
sshServer = stage-old.mozilla.org
# force 1.8 specific behavior
useTalkback = 0
symbolServer = stage-old.mozilla.org

View File

@@ -28,6 +28,7 @@ mofoCvsroot = :ext:cltbld@cvs.mozilla.org:/mofo
anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
@@ -60,16 +61,14 @@ ausServerUrl = https://aus2.mozilla.org
buildTree = MozillaRelease
# where QA updates/builds go
stagingUser = cltbld
stagingServer = build-console.build.mozilla.org
externalStagingUser = cltbld
externalStagingServer = stage.mozilla.org
stagingServer = stage-old.build.mozilla.org
# where beta updates/builds go
ftpServer = ftp.mozilla.org
# where release updates/builds go
bouncerServer = download.mozilla.org
# username and server to push builds
sshUser = cltbld
sshServer = build-console.build.mozilla.org
sshServer = stage-old.build.mozilla.org
# force 1.8 specific behavior
useTalkback = 1
useTarGz = 1

View File

@@ -33,6 +33,7 @@ mofoCvsroot = cltbld@cvs.mozilla.org:/mofo
anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
@@ -71,15 +72,13 @@ ausServerUrl = https://aus2.mozilla.org
buildTree = MozillaRelease
# where QA updates/builds go
stagingUser = cltbld
stagingServer = production-1.9-master.build.mozilla.org
externalStagingUser = cltbld
externalStagingServer = stage-old.mozilla.org
stagingServer = stage-old.mozilla.org
# where beta updates/builds go
ftpServer = ftp.mozilla.org
# where release updates/builds go
bouncerServer = download.mozilla.org
# username and server to push builds
sshUser = cltbld
sshServer = production-1.9-master.build.mozilla.org
sshServer = stage-old.mozilla.org
useTalkback = 0
useCvsCompression = 1

View File

@@ -33,10 +33,10 @@ mofoCvsroot = staging-1.9-master.build.mozilla.org:/builds/cvsmirror/mofo
anonCvsroot = staging-1.9-master.build.mozilla.org:/builds/cvsmirror/cvsroot
# private staging area
stageHome = /data/cltbld
sourceDir = /builds/source
updateDir = /builds/updates
verifyDir = /builds/verify
tagDir = /builds/tags
sourceDir = /builds/source
configBumpDir = /builds/config
# Build platform, as specified by tinderbox
linux_buildPlatform = Linux_2.6.18-53.1.13.el5_Depend