Skip to content
This repository has been archived by the owner on Jun 11, 2019. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
merge default -> production
--HG--
branch : production-0.8
  • Loading branch information
escapewindow committed Jul 12, 2012
2 parents 80c7d38 + fa6bfc7 commit c423c41
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
12 changes: 12 additions & 0 deletions process/factory.py
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions steps/misc.py
Expand Up @@ -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
Expand All @@ -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))
Expand Down

0 comments on commit c423c41

Please sign in to comment.