From efba85dcfa234b40160864e6eeddd472fb9853a9 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 Jan 2018 15:06:15 +0200 Subject: 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. --- worker_manager | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'worker_manager') 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 -- cgit v1.2.1