summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2020-04-11 15:29:34 +0300
committerLars Wirzenius <liw@liw.fi>2020-04-11 15:29:34 +0300
commitfdfad09bf63b5b3d23c4f8cae47b047f4abee052 (patch)
tree358ef7550a63726c87f53cda02fa8566af7a8e9e
parent254508f0975368b7eba3ed88fa4f1b11a877af16 (diff)
downloadick-contractor-fdfad09bf63b5b3d23c4f8cae47b047f4abee052.tar.gz
Add: overall runtime to output
-rwxr-xr-xcontractor5
1 files changed, 4 insertions, 1 deletions
diff --git a/contractor b/contractor
index ce0c0b5..7a4253e 100755
--- a/contractor
+++ b/contractor
@@ -58,6 +58,7 @@ class ContractorApplication(cliapp.Application):
def cmd_build(self, args):
timer = Timer(self.verbose)
+ overall = Timer(self.verbose)
self.verbose('building using spec at {}'.format(args[0]))
bs = self.load_build_spec(args[0])
@@ -111,6 +112,7 @@ class ContractorApplication(cliapp.Application):
self.verbose('saving workspace to {}'.format(ws))
m.save_workspace(ws)
+ overall.report('complete-run')
self.verbose('build finished OK')
def load_build_spec(self, filename):
@@ -343,6 +345,7 @@ class Manager:
if ip is None:
continue
w = Worker(self, ip)
+ self.ssh(['ssh-keygen', '-R', ip])
if not w.ssh(['true'], quiet=True).failed():
self._timer.report('wait-for-worker')
return w
@@ -362,7 +365,7 @@ class Manager:
self._timer.report('mount-workspace')
er = self.ssh(
- ['sudo', 'chown', '{}:{}'.format(WORKER_UID, WORKER_GID),
+ ['sudo', 'chown', '-R', '{}:{}'.format(WORKER_UID, WORKER_GID),
'/mnt'])
if er.failed():
return er