Merge pull request #65 from peternewman/master

Add the conf page build config

Author: peternewman

.travis-ci.sh

@@ -8,8 +8,8 @@ if [[ $TASK = 'flake8' ]]; then
   # build.config has to be checked seperately, as it's not strictly a Python file
   flake8 --max-line-length 80 --exclude *_pb2.py,.git,__pycache --ignore E111,E121,E129,F821 build.config
 elif [[ $TASK = 'pychecker' ]]; then
-  # Can't check these files as they aren't true .py files: build.config master.cfg 
-  pychecker --quiet --maxargs 12 config_helper.py pass_toucher.py
+  # Can't check these files as they aren't true .py files: build.config master.cfg
+  pychecker --quiet --maxargs 13 config_helper.py pass_toucher.py
 else
   # Otherwise run checkconfig as normal
   mkdir buildbot && cd buildbot && buildbot create-master master && \

build.config

@@ -73,7 +73,7 @@ SLAVES = {
             ja_rule_slave=True, has_ola_ja_rule_deps=False),  # Peter
     ],
     'i686': [
-      Slave('docs', generate_doc=True, generate_man=True,
+      Slave('docs', generate_conf=True, generate_doc=True, generate_man=True,
             no_build=True, ja_rule_slave=True),  # Simon, GCE VM
       Slave('noopenslp'),  # RenZO
     ],

config_helper.py

@@ -30,14 +30,15 @@ def LoadConfig(config_file):
 class SlaveConfig(object):
   def __init__(self, suffix, has_cpp_lint=False, has_js_lint=False,
                has_tcmalloc=False, has_ola_ja_rule_deps=True, is_slow=False,
-               generate_doc=False, generate_man=False, no_build=False,
-               ola_slave=True, ja_rule_slave=False):
+               generate_conf=False, generate_doc=False, generate_man=False,
+               no_build=False, ola_slave=True, ja_rule_slave=False):
     self._suffix = suffix
     self._has_cpp_lint = has_cpp_lint
     self._has_js_lint = has_js_lint
     self._has_tcmalloc = has_tcmalloc
     self._has_ola_ja_rule_deps = has_ola_ja_rule_deps
     self._is_slow = is_slow
+    self._generate_conf = generate_conf
     self._generate_doc = generate_doc
     self._generate_man = generate_man
     self._no_build = no_build
@@ -68,6 +69,10 @@ def has_ola_ja_rule_deps(self):
   def is_slow(self):
     return self._is_slow
 
+  @property
+  def generate_conf(self):
+    return self._generate_conf
+
   @property
   def generate_doc(self):
     return self._generate_doc
@@ -99,6 +104,7 @@ def __init__(self, platform, arch, slave_config):
     self._has_tcmalloc = slave_config.has_tcmalloc
     self._has_ola_ja_rule_deps = slave_config.has_ola_ja_rule_deps
     self._is_slow = slave_config.is_slow
+    self._generate_conf = slave_config.generate_conf
     self._generate_doc = slave_config.generate_doc
     self._generate_man = slave_config.generate_man
     self._no_build = slave_config.no_build
@@ -138,6 +144,10 @@ def has_ola_ja_rule_deps(self):
   def is_slow(self):
     return self._is_slow
 
+  @property
+  def generate_conf(self):
+    return self._generate_conf
+
   @property
   def generate_doc(self):
     return self._generate_doc
@@ -184,6 +194,11 @@ def IsSlow(slave):
   return slave.is_slow
 
 
+def GenerateConf(slave):
+  """Filter on slaves that generate conf pages."""
+  return slave.generate_conf
+
+
 def GenerateDoc(slave):
   """Filter on slaves that generate doxygen doc."""
   return slave.generate_doc

master.cfg

@@ -208,6 +208,14 @@ ola_hc_factory.addStep(Compile(
     lazylogfiles=True,
 ))
 
+# OLA conf help factory
+ola_conf_factory = BuildFactory()
+ola_conf_factory.addStep(Git(repourl=BuildRepoURL(config['OLA_REPO'])))
+ola_conf_factory.addStep(ShellCommand(
+    workdir="build/plugins",
+    command=["./generate-html.sh", "/opt/www/docs.openlighting.org/ola/conf/"],
+    name="generate"))
+
 # OLA doxygen doc factory
 ola_doc_factory = BuildFactory()
 ola_doc_factory.addStep(Git(repourl=BuildRepoURL(config['OLA_REPO'])))
@@ -372,6 +380,17 @@ for branch_name in builder_branches['ola'].keys():
 
 # Trunk only builders, these generally generate output to the website, so we
 # only run them against the bleeding edge trunk branch
+ola_conf_slaves = slaves.GetSlaves(config_helper.OlaSlave,
+                                   config_helper.GenerateConf)
+if ola_conf_slaves:
+  builder_branches['ola'][config['OLA_TRUNK_NAME']].append(
+      "conf-page-generator-ola")
+  c['builders'].append(
+      BuilderConfig(name="conf-page-generator-ola",
+                    slavenames=[s.name() for s in ola_conf_slaves],
+                    factory=ola_conf_factory,
+                    tags=['ola', ("ola-%s" % config['OLA_TRUNK_NAME'])]))
+
 ola_doc_slaves = slaves.GetSlaves(config_helper.OlaSlave,
                                   config_helper.GenerateDoc)
 if ola_doc_slaves: