diff options
| author | Lars Wirzenius <liw@liw.fi> | 2018-01-18 15:14:28 +0200 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2018-01-18 15:18:03 +0200 |
| commit | 708a497c369601909bc57768bc929fdccc235406 (patch) | |
| tree | e6f5a025a280d74d13b28452dfa6e6dc3b8e2953 /ick2 | |
| parent | b7f0f336a6300f805db64139a507996df182d765 (diff) | |
| download | ick2-708a497c369601909bc57768bc929fdccc235406.tar.gz | |
Change: rename 'name' field on pipelines to 'pipeline'
For consistency.
Diffstat (limited to 'ick2')
| -rw-r--r-- | ick2/pipelineapi.py | 2 | ||||
| -rw-r--r-- | ick2/projectapi_tests.py | 6 | ||||
| -rw-r--r-- | ick2/state.py | 2 | ||||
| -rw-r--r-- | ick2/workapi.py | 6 | ||||
| -rw-r--r-- | ick2/workapi_tests.py | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/ick2/pipelineapi.py b/ick2/pipelineapi.py index 061505e..c774df3 100644 --- a/ick2/pipelineapi.py +++ b/ick2/pipelineapi.py @@ -22,4 +22,4 @@ class PipelineAPI(ick2.ResourceApiBase): super().__init__('pipelines', state) def get_resource_name(self, resource): - return resource['name'] + return resource.get('pipeline') diff --git a/ick2/projectapi_tests.py b/ick2/projectapi_tests.py index 4e55ccf..c3e35f5 100644 --- a/ick2/projectapi_tests.py +++ b/ick2/projectapi_tests.py @@ -45,7 +45,7 @@ class ProjectAPITests(unittest.TestCase): def test_creates_project(self): pipeline = { - 'name': 'build', + 'pipeline': 'build', 'actions': [ {'shell': 'step-1'}, ], @@ -72,7 +72,7 @@ class ProjectAPITests(unittest.TestCase): 'project': 'foo', 'pipelines': [ { - 'name': 'build', + 'pipeline': 'build', 'actions': [ { 'shell': 'step-1', @@ -138,7 +138,7 @@ class ProjectAPITests(unittest.TestCase): def test_updates_pipeline_status(self): pipeline = { - 'name': 'build', + 'pipeline': 'build', 'actions': [ {'shell': 'step-1'}, ], diff --git a/ick2/state.py b/ick2/state.py index 2456bfc..c7bed19 100644 --- a/ick2/state.py +++ b/ick2/state.py @@ -175,7 +175,7 @@ class Builds(ResourceStore): # pragma: no cover class PipelineInstances(ResourceStore): # pragma: no cover def __init__(self, state): - super().__init__(state, 'pipeline_instances', 'name') + super().__init__(state, 'pipeline_instances', 'pipeline') def _name(self, project_name, pipeline_name): return '{} {}'.format(project_name, pipeline_name) diff --git a/ick2/workapi.py b/ick2/workapi.py index 8237ff4..e12b0d8 100644 --- a/ick2/workapi.py +++ b/ick2/workapi.py @@ -64,7 +64,7 @@ class WorkAPI(ick2.APIbase): 'build_id': build_id, 'worker': worker, 'project': project['project'], - 'pipeline': pipeline['name'], + 'pipeline': pipeline['pipeline'], 'parameters': project.get('parameters', {}), 'step': actions[current_action], 'log': '/logs/{}'.format(build_id), @@ -90,7 +90,7 @@ class WorkAPI(ick2.APIbase): def _update_pipeline(self, project, pipeline_instance): project_name = project['project'] - pipeline_name = pipeline_instance['name'] + pipeline_name = pipeline_instance['pipeline'] try: self._pinstances.update_instance( project_name, pipeline_name, pipeline_instance) @@ -110,7 +110,7 @@ class WorkAPI(ick2.APIbase): 'log': '/logs/{}'.format(build_id), 'worker': worker, 'project': project['project'], - 'pipeline': pipeline['name'], + 'pipeline': pipeline['pipeline'], 'parameters': parameters, 'status': 'building', 'actions': actions, diff --git a/ick2/workapi_tests.py b/ick2/workapi_tests.py index 48c9bbb..049e17c 100644 --- a/ick2/workapi_tests.py +++ b/ick2/workapi_tests.py @@ -35,7 +35,7 @@ class WorkAPITests(unittest.TestCase): def create_project_api(self): pipeline = { - 'name': 'build', + 'pipeline': 'build', 'actions': [ {'shell': 'step-1'}, {'shell': 'step-2'}, |