Permalink
Browse files

merge default -> production

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 80c7d38 + fa6bfc7 commit c423c417eae4f5f1c548270ed74a1dcbae217d0d @escapewindow escapewindow committed Jul 12, 2012
Showing with 14 additions and 2 deletions.
  1. +12 −0 process/factory.py
  2. +2 −2 steps/misc.py
View
12 process/factory.py
@@ -953,6 +953,18 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
self.addStep(MockInit(
target=self.mock_target,
))
+ # XXX: Hardcoding these directories here sucks.
+ self.addStep(ShellCommand(
+ command=['mock_mozilla', '-r', self.mock_target, '--copyin', '/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'],
+ haltOnFailure=True
+ ))
+ self.addStep(MockCommand(
+ command='chown -R mock_mozilla /home/mock_mozilla/.ssh',
+ target=self.mock_target,
+ mock=True,
+ workdir='/',
+ mock_args=[],
+ ))
# This is needed for the builds to start
self.addStep(MockCommand(
command=WithProperties("mkdir -p %(basedir)s" + "/%s" % self.baseWorkDir),
View
4 steps/misc.py
@@ -97,7 +97,7 @@ def interrupt(self, reason="Interrupted"):
class MockInit(ShellCommand):
-
+ haltOnFailure=True
name = "mock-init"
def __init__(self, target, **kwargs):
kwargs['command'] = "mock_mozilla -r %s --init" % target
@@ -108,7 +108,7 @@ def __init__(self, target, **kwargs):
self.addFactoryArguments(target=target)
class MockInstall(ShellCommand):
-
+ haltOnFailure=True
name = "mock-install"
def __init__(self, target, packages, **kwargs):
kwargs['command'] = "mock_mozilla -r %s --install %s" % (target, ' '.join(packages))

0 comments on commit c423c41

Please sign in to comment.