diff options
author | Lars Wirzenius <liw@liw.fi> | 2020-04-24 11:33:20 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2020-04-24 11:33:20 +0300 |
commit | d7b45d8ff5976555f25fb5fd92f9651f37afa5ae (patch) | |
tree | eefaedaea158017957ca6d34a182861a732d054e | |
parent | e58656733ecd648b5ab81b62289fd546d84cb157 (diff) | |
download | ick-contractor-d7b45d8ff5976555f25fb5fd92f9651f37afa5ae.tar.gz |
Change: clean up timing and other progress output
-rwxr-xr-x | contractor | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -57,7 +57,7 @@ class ContractorApplication(cliapp.Application): self.output.write('{}\n'.format(json.dumps(bs.as_dict(), indent=4))) def cmd_build(self, args): - self.verbose('building using spec at {}'.format(args[0])) + self.verbose('building according to {}'.format(args[0])) bs = self.load_build_spec(args[0]) dest = self.manager_destination() manager = RemoteServer(dest, verbose=self.verbose) @@ -143,20 +143,24 @@ class ContractorApplication(cliapp.Application): return BuildSpec(f.read()) def upload_worker_image(self, filename, dest): - self.verbose('uploading worker to manager: {}'.format(filename)) + self.verbose( + 'uploading to manager local worker image {}'.format(filename)) target = '{}:{}'.format(dest, WORKER_IMG) if rsync(filename, target).failed(): self.error('could not upload image to worker') sys.exit(1) def sync_to_workspace(self, frm, dest, subdir): + destdir = '/mnt/{}'.format(subdir) + self.verbose('syncing local {} to manager {}'.format(frm, destdir)) er = rsync( - '{}/.'.format(frm), '{}:/mnt/{}/.'.format(dest, subdir)) + '{}/.'.format(frm), '{}:{}/.'.format(dest, destdir)) if er.failed(): self.error('Failed to rsync saved workspace to worker') sys.exit(1) def sync_from_workspace(self, dest, ws): + self.verbose('syncing manager /mnt to local {}'.format(ws)) if not os.path.exists(ws): os.makedirs(ws) er = rsync('{}:/mnt/.'.format(dest), '{}/.'.format(ws)) |