From e4aed83f88c71c99caef47a68359fd224c72f6c8 Mon Sep 17 00:00:00 2001
From: Will Holland <william.holland@codethink.co.uk>
Date: Sat, 3 Oct 2015 11:37:53 +0100
Subject: Rename Deploy to Image(s)

---
 ciatlib/master.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ciatlib/master.py b/ciatlib/master.py
index 7c3daba..cc24e6f 100644
--- a/ciatlib/master.py
+++ b/ciatlib/master.py
@@ -30,8 +30,8 @@ Build = Step(
                 ("pipeline","no pipeline given")],
         timeout = 7200,
         get_definitions = True)
-Deploy = Step(
-        name = 'Deploy',
+Images = Step(
+        name = 'Image(s)',
         trigger = 'deploy_trigger.sh',
         properties = [
                 ('system','no system give'),
@@ -61,7 +61,11 @@ Publish = Step(
                 ('definitions_sha','no definitions SHA given'),
                 ("pipeline","no pipeline given")])
 
-Steps = [Build,Deploy,Test,Publish]
+Steps = {
+        "Build": Build,
+        "Image(s)": Images,
+        "Test": Test,
+        "Publish": Publish}
 
 class Column:
 
@@ -156,7 +160,7 @@ class Pipeline:
                     source_repo = BUILD_SLAVE_SCRIPTS,
                     category = category,
                     trigger = step.trigger,
-                    slavenames = self.slavenames,
+                    slavenames = [self.slavenames],
                     properties = step.properties,
                     timeout = step.timeout,
                     get_definitions = get_definitions))
@@ -170,8 +174,5 @@ def pipeline_from_dict(_dict):
     str_steps = _dict['steps']
     steps = []
     for step in str_steps:
-        for S in Steps:
-            if step == S.name:
-                steps.append(S)
-                break
+        steps.append(Steps[step])
     return Pipeline(name,candidate_refs,slave_type,clusters,steps)
-- 
cgit v1.2.1