summaryrefslogtreecommitdiff
path: root/contractor
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2020-04-09 15:53:15 +0300
committerLars Wirzenius <liw@liw.fi>2020-04-09 15:53:15 +0300
commite934e68ea8065254a92806541dbc45e02dde8af7 (patch)
tree3638c0b51fc9d795cf465dc603677969294972af /contractor
parent9f3e1dd3dc0ada615789000f385c9e52fe9a9879 (diff)
downloadick-contractor-e934e68ea8065254a92806541dbc45e02dde8af7.tar.gz
Change: build
Diffstat (limited to 'contractor')
-rwxr-xr-xcontractor17
1 files changed, 8 insertions, 9 deletions
diff --git a/contractor b/contractor
index 5fd3ab7..0dc164b 100755
--- a/contractor
+++ b/contractor
@@ -130,15 +130,10 @@ class ContractorApplication(cliapp.Application):
else:
self.verbose('no packages to install')
- # self.verbose('Running build commands')
- # o = self.on_worker(
- # 'worker', ['sh', '-euxc', build['build']],
- # stdout=None, stderr=None,
- # remote_cwd='/workspace/src')
- # if o is None:
- # self.error('Could not build on worker')
- # sys.exit(1)
- # self.output.write(o.decode('utf-8'))
+ self.verbose('building')
+ if w.build(bs.build()).failed():
+ self.error('build failed')
+ sys.exit(1)
# if workspace:
# self.verbose('Saving workspace to {}'.format(workspace))
@@ -583,5 +578,9 @@ class Worker:
['sudo', 'DEBIAN_FRONTEND=noninteractive',
'apt-get', '-y', 'install'] + pkgs)
+ def build(self, shell_text):
+ shell_text = 'cd /workspace/src\n' + shell_text
+ return self.ssh(['sh', '-euxc', shell_text])
+
ContractorApplication().run()