summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Holland <william.holland@codethink.co.uk>2015-09-30 23:49:34 +0100
committerWill Holland <william.holland@codethink.co.uk>2015-09-30 23:49:34 +0100
commit65415d6458a77a2fb3d8e10eccf0b97adc787538 (patch)
treedba8b5b10346522a471b5ca22485cec4db42b40b
parentf74f68d20a4bb110a6b73300c55eaaed0cf834c0 (diff)
downloadorchestration-65415d6458a77a2fb3d8e10eccf0b97adc787538.tar.gz
Fix not having generic columns
-rw-r--r--source/master.cfg2
-rw-r--r--source/orch_config.py91
2 files changed, 5 insertions, 88 deletions
diff --git a/source/master.cfg b/source/master.cfg
index 714394e..a9f38db 100644
--- a/source/master.cfg
+++ b/source/master.cfg
@@ -60,7 +60,7 @@ for _c in configure.get_categories():
from buildbot.schedulers.basic import SingleBranchScheduler
from buildbot.schedulers.forcesched import ForceScheduler
from buildbot.changes import filter
-columns = configure.get_columns()
+columns = configure.get_columns() + orch_config.columns
c['schedulers'] = []
for column in columns:
c['schedulers'].append(SingleBranchScheduler(
diff --git a/source/orch_config.py b/source/orch_config.py
index 37f41d3..199e1fb 100644
--- a/source/orch_config.py
+++ b/source/orch_config.py
@@ -1,3 +1,5 @@
+import ciatlib
+
categories = [
'repo_update',
'definitions_update_local-slave',
@@ -8,98 +10,13 @@ categories = [
buildslave_scripts = 'git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git'
-class Column:
- def __init__(self,
- name,
- category,
- trigger,
- slavenames,
- properties,
- timeout=1200,
- get_definitions=False):
- self.name = name
- self.category = category
- self.trigger = 'triggers/%s' % trigger
- self.slavenames = slavenames
- self.properties = properties
- self.timeout = timeout
- self.get_definitions=get_definitions
-
- from buildbot.process.factory import BuildFactory
- from buildbot.steps.shell import ShellCommand
- from buildbot.plugins import steps, util
-
- self.util_properties = []
- for property in self.properties:
- self.util_properties.append(
- util.Property(property[0],default=property[1]))
-
- self.factory = BuildFactory()
- self.factory.addStep(steps.Git(
- repourl=buildslave_scripts,
- mode='incremental'))
- self.cmd = ['sh',self.trigger]+self.util_properties
- if self.get_definitions:
- sha = util.Property("sha","cu010-trove/br6/firehose-test-1")
- get_defns_cmd = ['sh','get_definitions.sh',sha]
- self.factory.addStep(ShellCommand(command=get_defns_cmd,timeout=self.timeout))
- self.factory.addStep(ShellCommand(command=self.cmd,timeout=self.timeout))
-
columns = [
- Column( name = "1. Integration",
+ ciatlib.Column( name = "1. Integration",
category = "repo_update",
trigger = 'firehose_trigger.sh',
slavenames=["local-slave"],
properties = [('repo_name','no repo name given'),
- ('ref','no ref given')]),
- Column( name = "2. x86_64 Build",
- category = "definitions_update_local-slave",
- trigger = 'builders_trigger.sh',
- slavenames=["local-slave"],
- properties = [("ref","cu010-trove/br6/firehose-test-1"),
- ("sha","HEAD"),
- ("system",'genivi-demo-platform-x86_64-generic.morph')],
- timeout = 7200,
- get_definitions = True),
- Column( name = "3. ARM Build",
- category = "definitions_update_arm-slave",
- trigger = 'builders_trigger.sh',
- slavenames=["arm-slave"],
- properties = [("ref","cu010-trove/arm-base"),
- ("sha","HEAD"),
- ("system",'base-system-armv8l64.morph')],
- timeout = 7200,
- get_definitions = True),
- Column( name = "4. x86_64 Deploy",
- category = "build_complete",
- trigger = 'deploy_trigger.sh',
- slavenames=["local-slave"],
- properties = [
- ('system','no system give'),
- ('buildnumber',0),
- ('buildslave_scripts_sha','no buildslave-scripts SHA given'),
- ('definitions_sha','no definitions SHA given'),
- ('testing_sha','no testing SHA given')],
- timeout = 1800,
- get_definitions = True),
- Column( name = "5. Test",
- category = "deploy_complete",
- trigger = 'testing_trigger.sh',
- slavenames=["local-slave"],
- properties = [
- ('artefact','no artefact given'),
- ('testing_sha','no testing SHA given'),
- ('buildslave_scripts_sha','no buildslave-scripts SHA given'),
- ('definitions_sha','no definitions SHA given')]),
- Column( name = "6. Publish",
- category = "publish",
- trigger = 'publish_trigger.sh',
- slavenames=["local-slave"],
- properties = [
- ('artefact','no artefact given'),
- ('testing_sha','no testing SHA given'),
- ('buildslave_scripts_sha','no buildslave-scripts SHA given'),
- ('definitions_sha','no definitions SHA given')])]
+ ('ref','no ref given')])]
web_user = "codething"
web_user_password = "password"