From 0dd65bf7dffe144a6dcf1075978b452d13953e77 Mon Sep 17 00:00:00 2001 From: "rhelmer%mozilla.com" Date: Fri, 14 Dec 2007 20:15:51 +0000 Subject: [PATCH] upgrade sbc to firefox 20011 b=407672 r=cf --- .../automation/staging/master.cfg | 4 +-- tools/release/Makefile | 25 ++++++++----------- .../configs/fx-moz18-staging-bootstrap.cfg | 25 ++++++++++--------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/tools/buildbot-configs/automation/staging/master.cfg b/tools/buildbot-configs/automation/staging/master.cfg index 188941847cb..d70dedc3002 100644 --- a/tools/buildbot-configs/automation/staging/master.cfg +++ b/tools/buildbot-configs/automation/staging/master.cfg @@ -223,9 +223,9 @@ signFactory.addStep(FileDownload, mastersrc="bootstrap.cfg", signFactory.addStep(ShellCommand, description='echo bootstrap.cfg', command=['cat', 'bootstrap.cfg']) signFactory.addStep(ShellCommand, description='Fake signing log', - command=['/bin/bash', '-c', '""/bin/touch /home/ftp/pub/firefox/nightly/2.0.0.7-candidates/rc2/unsigned/win32_signing_rc2.log""'], haltOnFailure=1) + command=['/bin/bash', '-c', '""/bin/touch /home/ftp/pub/firefox/nightly/2.0.0.11-candidates/rc1/unsigned/win32_signing_rc1.log""'], haltOnFailure=1) signFactory.addStep(ShellCommand, description='Fake signing', - command=['/bin/bash', '-c', '""/bin/ln -fs /home/ftp/pub/firefox/nightly/2.0.0.7-candidates/rc2/unsigned/* /home/ftp/pub/firefox/nightly/2.0.0.7-candidates/rc2/""'], haltOnFailure=1) + command=['/bin/bash', '-c', '""/bin/ln -fs /home/ftp/pub/firefox/nightly/2.0.0.11-candidates/rc1/unsigned/* /home/ftp/pub/firefox/nightly/2.0.0.11-candidates/rc1/""'], haltOnFailure=1) signFactory.addStep(ShellCommand, description='Waiting for win32_signing_rc(n).log', command=['perl', './release', '-o', 'Sign'], timeout=86400, haltOnFailure=1) diff --git a/tools/release/Makefile b/tools/release/Makefile index 9dc6741cd43..ee46c7bc2fd 100644 --- a/tools/release/Makefile +++ b/tools/release/Makefile @@ -22,11 +22,11 @@ stage: chmod -R g+rwxs /home/ftp/pub/firefox chmod -R o+rx /home/ftp/pub # staging environment - mkdir -p /data/cltbld/firefox-2.0.0.6/batch1/stage - # download 2.0.0.6, for l10n verify - cd /data && wget -nv --cut-dirs=3 -np -r -e robots=off http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.6-candidates/rc2/ && mv ftp.mozilla.org/nightly/* /home/ftp/pub/firefox/nightly/ && rm -rfv ftp.mozilla.org - # download 2.0.0.6 release, for update verify - cd /data && wget -nv --cut-dirs=3 -np -r -e robots=off http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.6/ && mv releases.mozilla.org/releases/* /home/ftp/pub/firefox/releases/ && rm -rfv releases.mozilla.org + mkdir -p /data/cltbld/firefox-2.0.0.11/batch1/stage + # download 2.0.0.10, for l10n verify + cd /data && wget -nv --cut-dirs=3 -np -r -e robots=off http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.10-candidates/rc2/ && mv ftp.mozilla.org/nightly/* /home/ftp/pub/firefox/nightly/ && rm -rfv ftp.mozilla.org + # download 2.0.0.10 release, for update verify + cd /data && wget -nv --cut-dirs=3 -np -r -e robots=off http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.10/ && mv releases.mozilla.org/releases/* /home/ftp/pub/firefox/releases/ && rm -rfv releases.mozilla.org cvsmirror: cvsmirror_mofo cvsmirror_main @@ -36,15 +36,12 @@ cvsmirror_main: rsync -a --delete-after cvs-mirror.mozilla.org::l10n/ /builds/cvsmirror.clean/l10n/ chgrp -R cvs /builds/cvsmirror.clean/cvsroot /builds/cvsmirror.clean/l10n chmod -R g+rw /builds/cvsmirror.clean/cvsroot /builds/cvsmirror.clean/l10n - #cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_7_RELEASE mozilla - #cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_7_RELEASE_l10n mozilla - #cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_7_RC1 mozilla - #cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_7_RC1_l10n mozilla/tools/tinderbox-configs/ - cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_7_RC2 mozilla - cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_7_RC2_l10n mozilla/tools/tinderbox-configs/ - #cvs -d /builds/cvsmirror.clean/cvsroot rtag -d -B FIREFOX_2_0_0_7_MINIBRANCH mozilla - #cvs -d /builds/cvsmirror.clean/l10n rtag -d FIREFOX_2_0_0_7_RELEASE l10n - #cvs -d /builds/cvsmirror.clean/l10n rtag -d FIREFOX_2_0_0_7_RC1 l10n + cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_11_RELEASE mozilla + cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_11_RELEASE_l10n mozilla/tools/tinderbox-configs/ + cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_11_RC1 mozilla + cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_11_RC1_l10n mozilla/tools/tinderbox-configs/ + cvs -d /builds/cvsmirror.clean/l10n rtag -d FIREFOX_2_0_0_11_RELEASE l10n + cvs -d /builds/cvsmirror.clean/l10n rtag -d FIREFOX_2_0_0_11_RC1 l10n cvsmirror_mofo: mkdir -p /builds/cvsmirror.clean/tmp/mofo diff --git a/tools/release/configs/fx-moz18-staging-bootstrap.cfg b/tools/release/configs/fx-moz18-staging-bootstrap.cfg index fa881a04016..d17ab4e72c7 100644 --- a/tools/release/configs/fx-moz18-staging-bootstrap.cfg +++ b/tools/release/configs/fx-moz18-staging-bootstrap.cfg @@ -1,16 +1,16 @@ -version = 2.0.0.7 -milestone = 1.8.1.7 +version = 2.0.0.11 +milestone = 1.8.1.11 # _RCn and _RELEASE will be appended as-needed -productTag = FIREFOX_2_0_0_7 +productTag = FIREFOX_2_0_0_11 # Branch name and pull dates to use for base tag branchTag = MOZILLA_1_8_BRANCH -# manually tagged from GECKO181_20070712_RELBRANCH -pullDate = 2007-08-21 03:07 PDT -l10n_pullDate = 2007-08-21 03:07 PDT -rc = 2 +RelbranchOverride = GECKO181_20071115_RELBRANCH +pullDate = 2007-11-27 15:05 PST +l10n_pullDate = 2007-11-27 15:05 PST +rc = 1 # oldVersion and oldRc refer to the previous release -oldVersion = 2.0.0.6 -oldRc = 2 +oldVersion = 2.0.0.10 +oldRc = 1 appName = browser product = firefox # Absolute path to tinderbox build directory @@ -27,7 +27,7 @@ win32_logDir = /builds/logs mozillaCvsroot = staging-build-console.build.mozilla.org:/builds/cvsmirror/cvsroot l10nCvsroot = staging-build-console.build.mozilla.org:/builds/cvsmirror/l10n mofoCvsroot = staging-build-console.build.mozilla.org:/builds/cvsmirror/mofo -anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot +anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot # private staging area stageHome = /data/cltbld updateDir = /builds/updates @@ -43,7 +43,7 @@ macosx_l10n_buildPlatform = Darwin_8.7.0_Depend win32_l10n_buildPlatform = WINNT_5.2_Depend from = staging-bootstrap@mozilla.org to = build@mozilla.org -cc = rhelmer@mozilla.com +cc = nobody@mozilla.org patcherConfig = moz18-branch-patcher2.cfg # Tag to use for building MAR/MBSDIFF and other update tools patcherToolsRev = MOZILLA_1_9a2_RELEASE @@ -58,6 +58,7 @@ dumpLogs = 1 ausUser = cltbld ausServer = staging-build-console.build.mozilla.org ausServerUrl = http://staging-build-console.build.mozilla.org +# Tinderbox server tree that clients should report to buildTree = MozillaTest # where QA updates/builds go stagingUser = cltbld @@ -67,7 +68,7 @@ externalStagingServer = staging-prometheus-vm.build.mozilla.org # where beta updates/builds go ftpServer = staging-build-console.build.mozilla.org # where release updates/builds go -bouncerServer = staging-build-console.build..mozilla.org +bouncerServer = staging-prometheus-vm.build.mozilla.org # username and server to push builds sshUser = cltbld sshServer = staging-build-console.build.mozilla.org