diff options
Diffstat (limited to 'ick2/projectapi.py')
| -rw-r--r-- | ick2/projectapi.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ick2/projectapi.py b/ick2/projectapi.py index 0d9f8f5..a854716 100644 --- a/ick2/projectapi.py +++ b/ick2/projectapi.py @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2018 Lars Wirzenius +# Copyright (C) 2017-2019 Lars Wirzenius # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, either version 3 of the License, or @@ -50,16 +50,17 @@ class ProjectAPI(ick2.ResourceApiBase): ] def trigger_project(self, project, **kwargs): # pragma: no cover - with self._trans.modify('projects', project) as p: - self._start_build(p) + token = 'FIXME' + with self._trans.modify(token, 'projects', project) as p: + self._start_build(token, p) return {'status': ick2.BUILD_TRIGGERED} - def _start_build(self, project): # pragma: no cover + def _start_build(self, token, project): # pragma: no cover build_no = self._pick_build_number(project) build_id = '{}/{}'.format(project['project'], build_no) ick2.log.log('info', msg_text='Starting new build', build_id=build_id) - with self._trans.new('builds', build_id) as build: + with self._trans.new(token, 'builds', build_id) as build: parameters = project.get('parameters', {}) build.from_dict({ 'build_id': build_id, @@ -81,10 +82,10 @@ class ProjectAPI(ick2.ResourceApiBase): build_obj = ick2.Build(build) graph = build_obj.get_graph() graph.append_action(create_workspace) - for action in self._get_actions(project): + for action in self._get_actions(token, project): graph.append_action(action) - with self._trans.new('log', build_id) as r: + with self._trans.new(token, 'log', build_id) as r: r.from_dict({ 'build_id': build_id, 'log': '', @@ -101,11 +102,12 @@ class ProjectAPI(ick2.ResourceApiBase): old_build_no=old_build_no, build_no=build_no) return build_no - def _get_actions(self, project): # pragma: no cover + def _get_actions(self, token, project): # pragma: no cover actions = [] params = project.get('parameters', {}) for pipeline_name in project.get('pipelines', []): - pipeline = self._trans.get_resource('pipelines', pipeline_name) + pipeline = self._trans.get_resource( + token, 'pipelines', pipeline_name) wanted = pipeline.get('parameters', []) missing = [ name |