prefer only one worker

2 files changed, 20 insertions, 80 deletions

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 05ff995..544a65d 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -33,12 +33,7 @@ c["buildbotNetUsageData"] = "basic"
 
 ####### WORKERS
 
-c["workers"] = [
-    worker.Worker("unittests-worker", "unittests-pass"),
-    worker.Worker("integration-tests-worker", "integration-tests-pass"),
-    worker.Worker("parsing-tests-worker", "parsing-tests-pass")
-]
-
+c["workers"] = [worker.Worker("all-worker", "all-pass")]
 c["protocols"] = {"pb": {"port": "tcp:9990:interface=127.0.0.1"}}
 
 ####### CHANGESOURCES
@@ -55,16 +50,16 @@ c["change_source"] = [ALLCS]
 
 FORCE_SCHEDULER = schedulers.ForceScheduler(
     name="force-scheduler",
-    builderNames=["unittests-builder", "integration-tests-builder", "parsing-tests-builder"]
+    builderNames=["all-builder"]
 )
 
 GITPUSH_SCHEDULER = schedulers.SingleBranchScheduler(
     name="gitpush-scheduler",
     change_filter=util.ChangeFilter(
-        branch="master", project_re="libeufin(-tests)?$"
+        branch="master", project="libeufin"
     ),
     treeStableTimer=None,
-    builderNames=["unittests-builder", "integration-tests-builder", "parsing-tests-builder"]
+    builderNames=["all-builder"]
 )
 
 c["schedulers"] = [
@@ -90,8 +85,8 @@ CONFIGURE_COMMAND = ShellCommand(
     command=["./configure"]
 )
 
-UNITTESTS_FACTORY = util.BuildFactory()
-UNITTESTS_FACTORY.addSteps([
+ALL_FACTORY = util.BuildFactory()
+ALL_FACTORY.addSteps([
     Git(repourl="git://git.taler.net/libeufin", alwaysUseLatest=True),
     BOOTSTRAP_COMMAND,
     CONFIGURE_COMMAND,
@@ -102,60 +97,32 @@ UNITTESTS_FACTORY.addSteps([
         haltOnFailure=True,
         command=["make", "check"]
     )
-])
-
-INTEGRATION_TESTS_FACTORY = util.BuildFactory()
-INTEGRATION_TESTS_FACTORY.addSteps([
-    Git(repourl="git://git.taler.net/libeufin", alwaysUseLatest=True),
-    BOOTSTRAP_COMMAND,
-    CONFIGURE_COMMAND,
     ShellCommand(
         name="Integration tests",
-        description="Running the integration tests",
+        description="Running integration tests",
         descriptionDone="Integration tests done",
         haltOnFailure=True,
         command=["make", "tests"]
     )
-])
-
-PARSING_TESTS_FACTORY = util.BuildFactory()
-PARSING_TESTS_FACTORY.addSteps([
-    Git(repourl="git://git.taler.net/libeufin-tests", alwaysUseLatest=True),
-    BOOTSTRAP_COMMAND,
     ShellCommand(
         name="Parsing tests",
         description="Running the parsing tests",
         descriptionDone="Parsing tests done",
         haltOnFailure=True,
-        command=["make", "check"]
+        command=["make", "parse"]
     )
 ])
 
-
 ##### BUILDERS
 
-UNITTESTS_BUILDER = util.BuilderConfig(
+ALL_BUILDER = util.BuilderConfig(
     name="unittests-builder",
-    workernames=["unittests-worker"],
-    factory=UNITTESTS_FACTORY
-)
-
-INTEGRATION_TESTS_BUILDER = util.BuilderConfig(
-    name="integration-tests-builder",
-    workernames=["integration-tests-worker"],
-    factory=INTEGRATION_TESTS_FACTORY
-)
-
-PARSING_TESTS_BUILDER = util.BuilderConfig(
-    name="parsing-tests-builder",
-    workernames=["parsing-tests-worker"],
-    factory=PARSING_TESTS_FACTORY
+    workernames=["all-worker"],
+    factory=ALL_FACTORY
 )
 
 c["builders"] = [
-  UNITTESTS_BUILDER,
-  INTEGRATION_TESTS_BUILDER,
-  PARSING_TESTS_BUILDER
+  ALL_BUILDER
 ]
 
 ####### PROJECT IDENTITY
@@ -165,17 +132,13 @@ c["titleURL"] = "https://buildbot.libeufin.tech/"
 c["buildbotURL"] = "https://buildbot.libeufin.tech/"
 
 
-BUILDER_LIST = [
-    "unittests-builder",
-    "integration-tests-builder",
-    "parsing-tests-builder"
-]
+BUILDER_LIST = ["all-builder"]
 
 emailNotifier = reporters.MailNotifier(
     fromaddr="libeufin-build@taler.net",
     sendToInterestedUsers=False,
     mode=("change"),
-    builders=("integration-tests-builder", "unittests-builder", "parsing-tests-builder"),
+    builders=("all-builder"),
     extraRecipients=["libeufin@taler.net"],
     subject="Libeufin build."
 )
diff --git a/buildbot/prepare.sh b/buildbot/prepare.sh
index 4dc2ec3..ad28239 100755
--- a/buildbot/prepare.sh
+++ b/buildbot/prepare.sh
@@ -3,7 +3,7 @@
 set -eu
 
 if ! test -d $HOME/libeufin-deployment; then
-  echo Check out git://git.taler.net/libeufin-deployment is missing in CWD!
+  echo git://git.taler.net/libeufin-deployment is missing under \$HOME!
   exit 1
 fi
 
@@ -13,35 +13,12 @@ if ! test -d $HOME/buildbot_master/; then
   ln -s $HOME/libeufin-deployment/buildbot/master.cfg $HOME/buildbot_master/
 fi
 
-# make unittest worker
-if ! test -d $HOME/unittests_worker/; then
+# make the "all" worker
+if ! test -d $HOME/all_worker/; then
   buildbot-worker create-worker \
     --umask=0o22 \
-    $HOME/unittests_worker/ \
+    $HOME/all_worker/ \
     localhost:9990 \
-    unittests-worker \
-    unittests-pass
-fi
-
-
-# make integration tests worker
-if ! test -d $HOME/integration_tests_worker/; then
-  buildbot-worker \
-    create-worker \
-    --umask=0o22 \
-    $HOME/integration_tests_worker/ \
-    localhost:9990 \
-    integration-tests-worker \
-    integration-tests-pass
-fi
-
-# make parse-worker
-if ! test -d $HOME/parsing_tests_worker/; then
-  buildbot-worker \
-    create-worker \
-    --umask=0o22 \
-    $HOME/parsing_tests_worker/ \
-    localhost:9990 \
-    parsing-tests-worker \
-    parsing-tests-pass
+    all-worker \
+    all-pass
 fi