group tests by subsystem in checker-builder

1 files changed, 57 insertions, 37 deletions

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 7cebc4d..6245ebd 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -103,13 +103,13 @@ def git_step(repo,target_branch="master"):
 
 # Convenience function that runs 'make check' in a
 # directory of the code inside of a netjail.
-def jailed_check(package,srcdir):
-    return ShellCommand(
-        name="Test of " + srcdir + " in " + package,
-        description="Testing " + srcdir + " in " + package,
+def jailed_check(package,srcdirs):
+    return steps.ShellSequence(
+        name="Tests of " + package,
+        description="Testing " + package,
         descriptionDone="Pass",
-        command=["sudo", "/usr/local/bin/netjail.sh", "/home/integrationtest/deployment/buildbot/with-postgres.sh", "make", "check"],
-        workdir="../../sources/" + package + "/src/" + srcdir
+        commands=map(lambda srcdir: util.ShellArg(command=["sudo", "/usr/local/bin/netjail.sh", "/home/integrationtest/deployment/buildbot/with-postgres.sh", "bash", "-c", "'cd src/"+srcdir+" make check'"]), srcdirs),
+        workdir="../../sources/" + package
     )
 
 # Convenience function that checks out the deployment.
@@ -402,36 +402,56 @@ INTEGRATIONTEST_FACTORY.addStep(
         haltOnFailure=False
     )
 )
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("libmicrohttpd", "microhttpd"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("libmicrohttpd", "testcurl"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("libmicrohttpd", "testzzuf"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("gnunet", "util"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("gnunet", "pq"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("gnunet", "curl"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("gnunet", "json"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("twister", "test"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "util"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "curl"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "mhd"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "pq"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "json"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "bank-lib"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "exchangedb"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "auditordb"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "exchange"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "auditor"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "lib"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "exchange-tools"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "testing"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", "benchmark"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("merchant", "backenddb"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("merchant", "backend"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("merchant", "lib"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("merchant", "merchant-tools"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("sync", "util"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("sync", "syncdb"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("sync", "sync"))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("sync", "lib"))
+INTEGRATIONTEST_FACTORY.addStep(jailed_check ("libmicrohttpd", [
+    "microhttpd",
+    "testcurl",
+    "testzzuf",
+]))
+INTEGRATIONTEST_FACTORY.addStep(jailed_check ("gnunet", [
+    "util",
+    "pq",
+    "curl",
+    "json",
+]))
+INTEGRATIONTEST_FACTORY.addStep(jailed_check ("twister", [
+    "test",
+]))
+INTEGRATIONTEST_FACTORY.addStep(jailed_check ("exchange", [
+   "util",
+   "curl",
+   "mhd",
+   "pq",
+   "json",
+   "bank-lib",
+   "exchangedb",
+   "auditordb",
+   "exchange",
+   "auditor",
+   "lib",
+   "exchange-tools",
+   "testing",
+   "benchmark",
+]))
+INTEGRATIONTEST_FACTORY.addStep(jailed_check ("merchant", [
+   "mustach",
+   "backenddb",
+   "backend",
+   "lib",
+   "testing",
+   "merchant-tools",
+]))
+INTEGRATIONTEST_FACTORY.addStep(jailed_check ("sync", [
+    "util",
+    "syncdb",
+    "sync",
+    "lib"
+]))
+INTEGRATIONTEST_FACTORY.addStep(jailed_check ("anastasis", [
+    "util",
+    "stasis",
+    "testing",
+    "reducer",
+]))
 INTEGRATIONTEST_FACTORY.addStep(
     ShellCommand(
         name="bank check",
@@ -578,7 +598,7 @@ WALLET_FACTORY.addStep(
         name="test",
         description="Running wallet tests",
         descriptionDone="Test correctly run",
-        command=["timeout", "--preserve-status", "5m", "./$HOME/bin/taler-wallet-cli", "integrationtest", "--verbose"],
+        command=["timeout", "--preserve-status", "5m", "./$HOME/bin/taler-wallet-cli", "testing", "run-integrationtests", "--verbose"],
         workdir="build/",
     )
 )