From daa64158f20de9a8b4e0be299066b94e2f4943ee Mon Sep 17 00:00:00 2001
From: Pete Travis <immanetize@fedoraproject.org>
Date: Mar 18 2015 05:45:49 +0000
Subject: make the publican buildstep work


You must declare a list langs=[] and formats=[] or you will get en-US html-single.

Also, an edit to make the master template more reusable.

---

diff --git a/files/anerist/buildsteps.py b/files/anerist/buildsteps.py
index 481cddd..6ff1619 100644
--- a/files/anerist/buildsteps.py
+++ b/files/anerist/buildsteps.py
@@ -3,20 +3,26 @@ from buildbot.process.factory import *
 
 # Command Classes
 class PublicanBuild(ShellCommand):
-    name = "publican build",
+    name = "publican_build"
     haltOnFailure = 1
     flunkOnFailure = 1
     description = ["building"]
     descriptionDone = ["build complete"]
-    def __init__(self, langs=["all"]):
-        ShellCommand.__init__(self, **kwargs)
+    def __init__(self, langs=["en-US"], formats=["html-single"], **kwargs):
         command= [
             "/usr/bin/publican",
             "build",
-            "--langs %s" % ','.join(langs),\
-            "--formats %s" % ",".join(formats)
-        ]
+            "--langs",
+            ','.join(langs),\
+            "--formats",
+            ",".join(formats)
+            ]
+        ShellCommand.__init__(self, **kwargs)
         self.setCommand(command)
+    def start(self):
+        ShellCommand.start(self)
+
+
 
 class ZanataPublicanPull(ShellCommand):
     name = "zanata pull"
diff --git a/roles/buildbot-master/templates/master.py b/roles/buildbot-master/templates/master.py
index 52d5c63..9b21a77 100644
--- a/roles/buildbot-master/templates/master.py
+++ b/roles/buildbot-master/templates/master.py
@@ -209,11 +209,15 @@ def _publican_publisher_factory_step_generator(guide):
                 repourl=anon_url,
                 mode='incremental'
                 ),
-            ShellCommand(
-                name = "%s build" % guide,
-                command=["publican", "build", "--langs=all", "--formats=html,html-single,pdf,epub"],
-                haltOnFailure=True
+            PublicanBuild(
+                langs = ["en-US"],
+                formats = ["html-single"]
                 ),
+#            ShellCommand(
+#                name = "%s build" % guide,
+#                command=["publican", "build", "--langs=all", "--formats=html,html-single,pdf,epub"],
+#                haltOnFailure=True
+#                ),
             DirectoryUpload(
                 slavesrc="tmp",
                 masterdest=Interpolate(
@@ -235,12 +239,12 @@ def _publican_langtest_factory_step_generator(guide, lang):
             "--lang %s" % lang
             ]
     today_stamp = datetime.now().utcnow().strftime("%Y-%m-%d")
-    publican_build_command = [
-            "/usr/bin/publican",
-            "build",
-            "--langs %s" % lang,
-            "--formats html"
-            ]
+#    publican_build_command = [
+#            "/usr/bin/publican",
+#            "build",
+#            "--langs %s" % lang,
+#            "--formats html"
+#            ]
     git_commit_command = [
             "/usr/bin/git",
             "commit",
@@ -258,11 +262,16 @@ def _publican_langtest_factory_step_generator(guide, lang):
                 command = zanata_pull_command,
                 haltOnFailure=True
                 ),
-            ShellCommand(
-                name = "test_%s_build" % lang,
-                command = publican_build_command,
-                haltOnFailure=True
+            PublicanBuild(
+                langs = ["en-US"],
+                formats = ["html-single"]
                 ),
+                
+#            ShellCommand(
+#                name = "test_%s_build" % lang,
+#                command = publican_build_command,
+#                haltOnFailure=True
+#                ),
             ShellCommand(
                 name = "publican_clean",
                 command = ["/usr/bin/publican", "clean"]
@@ -284,11 +293,10 @@ def _publican_langtest_factory_step_generator(guide, lang):
 
 from buildbot.config import BuilderConfig
 
-lan_buildslaves = [
-        "buildslave01.home.randomuser.org",
-  	    "buildslave02.home.randomuser.org",
-        "buildslave03.home.randomuser.org"
-        ]
+lan_buildslaves = []
+{% for host in groups['buildbot-slaves'] %}
+lan_buildslaves.append("{{ host }}")
+{% endfor %}
 
 all_publican_builders = []
 
@@ -329,29 +337,6 @@ for guide in guide_list:
         treeStableTimer=None,
         ))
 
-    
-for guide in ["release-notes"]:
-    for lang in language_list:
-        publican_lang_test_builder = "%s-%s-integrator" % (guide, lang)
-        publican_factory[publican_lang_test_builder]=BuildFactory(
-                _publican_langtest_factory_step_generator(guide, lang)
-                )
-        c['builders'].append(
-                BuilderConfig(
-                    name=publican_lang_test_builder,
-                    slavenames=lan_buildslaves,
-                    factory=publican_factory[publican_lang_test_builder]
-                    )
-                )
-        c['schedulers'].append(AnyBranchScheduler(
-                name=publican_lang_test_builder,
-                builderNames=[publican_lang_test_builder],
-                change_filter=filtered_branches,
-                treeStableTimer=None
-                )
-            )
-                       
-
 c['schedulers'].append(ForceScheduler(
                             name="PanicRebuild",
                             builderNames=all_publican_builders