From 84ca97562f9abc2f21671f7db18fa5ddb801ff34 Mon Sep 17 00:00:00 2001 From: "ccooper%deadsquid.com" Date: Tue, 23 Dec 2008 19:40:09 +0000 Subject: [PATCH] b=470715 r=armenzg - update client.mk before other modules git-svn-id: svn://10.0.0.236/trunk@255626 18797224-902f-48f8-a5cc-f745e15eee43 --- .../automation/production-1.9/master.cfg | 6 ++--- .../automation/staging-1.9/master.cfg | 25 +++++++++---------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/mozilla/tools/buildbot-configs/automation/production-1.9/master.cfg b/mozilla/tools/buildbot-configs/automation/production-1.9/master.cfg index 914622f0cf6..3baba7b809b 100644 --- a/mozilla/tools/buildbot-configs/automation/production-1.9/master.cfg +++ b/mozilla/tools/buildbot-configs/automation/production-1.9/master.cfg @@ -333,10 +333,8 @@ L10nNightlyFactory.addStep(ShellCommand, workdir=".", haltOnFailure = True) L10nNightlyFactory.addStep(ShellCommand( - command=["cvs", "-q", "-z3", "-d", cvsroot, "co", "mozilla/client.mk", - "mozilla/nsprpub", - # We need this for windows - "mozilla/other-licenses/7zstub/firefox"], + command=["sh", "-c", + "cvs -q -z3 -d "+cvsroot+" co mozilla/client.mk && cvs -q -z3 -d "+cvsroot+" co mozilla/nsprpub mozilla/other-licenses/7zstub/firefox"], descriptionDone="client.mk checked out", workdir=".", haltOnFailure = True diff --git a/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg b/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg index 5e7c3670e57..5da23cc89b9 100644 --- a/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg +++ b/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg @@ -6,6 +6,15 @@ # Use shorter alias to save typing. c = BuildmasterConfig = {} +# Declarations +cvsroot = ":ext:stgbld@cvs.mozilla.org:/cvsroot" +cvsl10nroot = 'staging-1.9-master:/builds/cvsmirror/l10n' +cvsmodule = "mozilla/tools/release" +ftpserver = "fx-linux-1.9-slave1" +automation_tag = "HEAD" +uploadPath = "/home/ftp/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0-l10n/" +enUS_binaryURL = 'http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0' + ####### Reload imported modules # l10n logic import buildbotcustom.l10n.scheduler @@ -100,7 +109,7 @@ l10n_nightly_scheduler = NightlyL10n( 'macosx_l10n_nightly', ], repoType='cvs', - cvsRoot=':ext:stgbld@cvs.mozilla.org:/cvsroot', + cvsRoot=cvsroot, # You can specify your own list of locales # locales=['af','en-GB','de'] ) @@ -168,14 +177,6 @@ c['change_source'].append(PBChangeSource()) ####### BUILDERS -cvsroot = ":ext:stgbld@cvs.mozilla.org:/cvsroot" -cvsl10nroot = 'staging-1.9-master:/builds/cvsmirror/l10n' -cvsmodule = "mozilla/tools/release" -ftpserver = "fx-linux-1.9-slave1" -automation_tag = "HEAD" -uploadPath = "/home/ftp/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0-l10n/" -enUS_binaryURL = 'http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0' - c['builders'] = [] from buildbot.process import factory @@ -348,10 +349,8 @@ L10nNightlyFactory.addStep(ShellCommand, workdir=".", haltOnFailure = True) L10nNightlyFactory.addStep(ShellCommand( - command=["cvs", "-q", "-z3", "-d", cvsroot, "co", "mozilla/client.mk", - "mozilla/nsprpub", - # We need this for windows - "mozilla/other-licenses/7zstub/firefox"], + command=["sh", "-c", + "cvs -q -z3 -d "+cvsroot+" co mozilla/client.mk && cvs -q -z3 -d "+cvsroot+" co mozilla/nsprpub mozilla/other-licenses/7zstub/firefox"], descriptionDone="client.mk checked out", workdir=".", haltOnFailure = True