diff options
author | Lars Wirzenius <liw@liw.fi> | 2018-01-13 15:06:15 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2018-01-14 22:23:47 +0200 |
commit | efba85dcfa234b40160864e6eeddd472fb9853a9 (patch) | |
tree | 24123be0482f40f877a1693dff91508f11c83c3c /worker_manager | |
parent | b1a4f39271979b1f1f9e461d8f97c2f01b6ab407 (diff) | |
download | ick2-efba85dcfa234b40160864e6eeddd472fb9853a9.tar.gz |
Add: prepend a create_workspace action to pipelines
This replaces the old fresh_workspace attribute of work resources.
It's better this way, because it moves policy from worker-manager to
controller, where it belongs.
Diffstat (limited to 'worker_manager')
-rwxr-xr-x | worker_manager | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/worker_manager b/worker_manager index dcb6fda..bdd982c 100755 --- a/worker_manager +++ b/worker_manager @@ -269,10 +269,6 @@ class Worker: step = work['step'] logging.info('Running step: %r', step) exit_code = 0 - if work.get('fresh_workspace'): - logging.info('Make an empty workspace') - cleaner = WorkspaceCleaner(None, self._workspace, post) - exit_code = cleaner.do(work) if exit_code == 0: klass = self.worker_factory(step) if klass is None: @@ -306,6 +302,8 @@ class Worker: return DebootstrapWorker elif 'archive' in step: return WorkspaceArchiver + elif step.get('action') == 'create_workspace': + return WorkspaceCleaner logging.warning('Cannot find worker for %s', step) return None |