Refactor: upload new worker image first

This enables us to do more steps in one SSH invocation later if we
want to.

1 files changed, 4 insertions, 4 deletions

diff --git a/contractor b/contractor
index 89bb98f..ce0c0b5 100755
--- a/contractor
+++ b/contractor
@@ -64,16 +64,16 @@ class ContractorApplication(cliapp.Application):
         m = self.manager(timer)
         timer.report('load-build-spec')
 
-        # This might fail. We ignore the failure.
-        self.verbose('stopping worker')
-        m.kill_worker()
-
         self.verbose(
             'uploading image to worker: {}'.format(bs.worker_image()))
         if m.upload_worker_image(bs.worker_image()).failed():
             self.error('could not upload image to worker')
             sys.exit(1)
 
+        # This might fail. We ignore the failure.
+        self.verbose('stopping worker')
+        m.kill_worker()
+
         self.verbose('setting up workspace on worker')
         ws = bs.workspace()
         source = bs.source()