summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Holland <william.holland@codethink.co.uk>2015-10-07 16:17:22 +0100
committerWill Holland <william.holland@codethink.co.uk>2015-10-07 16:17:22 +0100
commit93bacd8ad6412394bf3f8695b8a98a13359e8256 (patch)
treeaec950b58624932322cdfb7ff5d0e395ada17d70
parent383eb70373783f1ad6fca66b2b514ead632fbd89 (diff)
downloadorchestration-93bacd8ad6412394bf3f8695b8a98a13359e8256.tar.gz
Clean up TODOs
-rw-r--r--source/bottlerock.py2
-rw-r--r--source/master.cfg3
-rw-r--r--source/setup.sh9
3 files changed, 2 insertions, 12 deletions
diff --git a/source/bottlerock.py b/source/bottlerock.py
index ede220e..47c061a 100644
--- a/source/bottlerock.py
+++ b/source/bottlerock.py
@@ -91,7 +91,7 @@ def repo_update():
elif ref in candidate_refs:
# if a candidate ref changes then trigger that pipeline
pipeline = configure.pipeline_from_candidate_ref(ref)
- # TODO parse system from cluster properly
+ # TODO get the system needed from the cluster given
if 'base-system-armv8l64.morph' in pipeline.clusters:
system = 'base-system-armv8l64.morph'
else:
diff --git a/source/master.cfg b/source/master.cfg
index a90705a..4e81e29 100644
--- a/source/master.cfg
+++ b/source/master.cfg
@@ -21,7 +21,7 @@ c = BuildmasterConfig = {}
from buildbot.buildslave import BuildSlave
c['slaves'] = []
-# TODO this needs replacing to be elastic
+# TODO this needs replacing to be elastic, the slaves need to be added dynamically
for slave in orch_config.slaves:
c['slaves'].append(BuildSlave(slave['name'], slave['password']))
@@ -49,7 +49,6 @@ c['change_source'].append(PBChangeSource(
from buildbot.changes.filter import ChangeFilter
categories = {}
-#TODO get categories from orch_config rather than hard coded list
for _c in configure.get_categories()+orch_config.categories:
categories[_c] = ChangeFilter(category=_c)
diff --git a/source/setup.sh b/source/setup.sh
deleted file mode 100644
index fae3270..0000000
--- a/source/setup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# TODO skip this bit if orchenv exists
-virtualenv --no-site-packages orchenv
-source orchenv/bin/activate
-easy_install sqlachemy=0.7.10
-easy_install buildbot
-
-buildbot create-master master
-cp source/master.cfg master/master.cfg