Browse Source

buildbot/master: fix the common steps

* master.cfg: Trailing commas on common steps, left from moving out from a
  list, had made the assignment be of tuples. All kinds of funniness ensued.
  Also, rpm builder, had dropped configure step in using common steps.
Paul Jakma 4 years ago
parent
commit
a9bba93948
1 changed files with 9 additions and 9 deletions
  1. 9 9
      infra/buildbot/master/master.cfg

+ 9 - 9
infra/buildbot/master/master.cfg

@@ -322,13 +322,12 @@ step_autoconf = steps.ShellCommand(command=["./update-autotools"],
 git_and_autoconf = [
 	step_git, step_autoconf,
 ]
-configure_and_clean = [
-	steps.Configure(command="../build/configure"),
-	steps.ShellCommand(command=["make", "clean"],
+step_configure = steps.Configure(command="../build/configure")
+step_clean = steps.ShellCommand(command=["make", "clean"],
 				description="cleaning",
-				descriptionDone="make clean"),
-]
+				descriptionDone="make clean")
 
+configure_and_clean = [ step_configure, step_clean ]
 common_setup = git_and_autoconf + configure_and_clean
 
 ### Default 'check' build, builder instantiated for each OS
@@ -337,8 +336,8 @@ factory = util.BuildFactory()
 
 factory.addSteps(common_setup)
 
-factory.addStep(steps.Compile(command=["make", "-j", "2", "all"]))
-factory.addStep(steps.ShellCommand(command=["make", "check"],
+factory.addStep(steps.Compile(command=["make", "-j", "all"]))
+factory.addStep(steps.ShellCommand(command=["make", "-j", "check"],
 				   description="checking",
 				   descriptionDone="make check"))
 
@@ -355,7 +354,7 @@ factory = util.BuildFactory()
 
 factory.addSteps(common_setup)
 
-factory.addStep(steps.ShellCommand(command=["make", "distcheck"],
+factory.addStep(steps.ShellCommand(command=["make", "-j", "distcheck"],
 				   description="run make distcheck",
 				   descriptionDone="make distcheck"))
 c['builders'].append(
@@ -410,7 +409,8 @@ f = util.BuildFactory ()
 # check out the source
 f.addStep(steps.Git(repourl=quaggagit, mode='full'))
 
-f.addSteps(git_and_autoconf)
+f.addStep(step_autoconf)
+f.addStep(step_configure)
 
 f.addStep(steps.ShellCommand(command=["make", "dist"],
 				     description="run make dist",