Buildbot.

Adapt test-builder and wallet-builder to use Docker.

5 files changed, 13 insertions, 66 deletions

diff --git a/buildbot/build.sh b/buildbot/build.sh
index 6d99cac..bdfc551 100755
--- a/buildbot/build.sh
+++ b/buildbot/build.sh
@@ -2,14 +2,11 @@
 
 set -eu
 
-echo "Running taler-deployment bootstrap"
+echo "Building the Docker base image (taler_local/taler_base)."
 
-# Cannot have this here, as the activate script
-# will be made by the 'bootstrap' command.
-# source "${HOME}/activate".  Currently under test.
+${HOME}/deployment/docker/demo/build_base.sh \
+  ${HOME}/deployment/docker/images/base/Dockerfile
 
-${HOME}/deployment/bin/taler-deployment bootstrap
-
-echo "Running taler-deployment build"
-source "${HOME}/activate"
-taler-deployment build
+echo "Building each service's image."
+cd ${HOME}/deployment/docker/demo
+docker-compose build
diff --git a/buildbot/create_instances.sh b/buildbot/create_instances.sh
deleted file mode 100755
index c67cff6..0000000
--- a/buildbot/create_instances.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Step for the BUILD_FACTORY running the 'test.taler.net' site.
-set -eu
-
-source "${HOME}/activate"
-taler-deployment-config-instances
diff --git a/buildbot/create_tip_reserve.sh b/buildbot/create_tip_reserve.sh
deleted file mode 100755
index df756d3..0000000
--- a/buildbot/create_tip_reserve.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Step for the BUILD_FACTORY running the 'test.taler.net' site.
-set -eu
-
-source "${HOME}/activate"
-taler-deployment-config-tips
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 24f5483..1e53163 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -670,16 +670,18 @@ WALLET_FACTORY.addStep(
         haltOnFailure=True
     )
 )
+
 WALLET_FACTORY.addStep(
     ShellCommand(
         name="test",
         description="Running wallet tests",
         descriptionDone="Test correctly run",
         command=["timeout", "--preserve-status", "5m",
+                 "docker", "run", "-i", "-t", "taler_local/taler_base",
                  "taler-wallet-cli", "testing", "run-integrationtests",
                  "--suites", "wallet,merchant,libeufin,wallet-backup,wallet-tipping"],
         workdir="../../",
-        env={'PATH': "${HOME}/local/bin:${PATH}"}
+        env={'PATH': "${HOME}/bin:${PATH}"}
     )
 )
 
@@ -1002,20 +1004,8 @@ BUILD_FACTORY.addStep(
 
 BUILD_FACTORY.addStep(
     ShellCommand(
-        name="keys generation and sign",
-        description="Generating exchange keys, and auditor-sign them.",
-        descriptionDone="Exchange keys generated, and auditor-signed.",
-        command=["timeout", "--preserve-status", "1m",
-                 "./keys.sh"],
-        workdir="../../deployment/buildbot",
-        haltOnFailure=True,
-        env={'BRANCH': util.Property("branch")}
-    )
-)
-BUILD_FACTORY.addStep(
-    ShellCommand(
         name="restart services",
-        description="Restarting inactive blue-green party.",
+        description="Restart services keeping data.",
         descriptionDone="Restarting Taler.",
         command=["./restart.sh"],
         workdir="../../deployment/buildbot",
@@ -1034,29 +1024,6 @@ BUILD_FACTORY.addStep(
         env={'DEPLOYMENT': "test"}
     )
 )
-BUILD_FACTORY.addStep(
-    ShellCommand(
-        name="create instances",
-        description="Create merchant instances.",
-        descriptionDone="All the instances got created.",
-        command=["./create_instances.sh"],
-        workdir="../../deployment/buildbot",
-        haltOnFailure=True,
-        env={'DEPLOYMENT': "test"}
-    )
-)
-
-BUILD_FACTORY.addStep(
-    ShellCommand(
-        name="activate tip reserve",
-        description="Instruct the merchant to pay and authorize the tip reserve.",
-        descriptionDone="The tip reserve got payed and authorized.",
-        command=["./create_tip_reserve.sh"],
-        workdir="../../deployment/buildbot",
-        haltOnFailure=True,
-        env={'DEPLOYMENT': "test"}
-    )
-)
 
 BUILDERS.append(util.BuilderConfig(
     name="test-builder", workernames=["test-worker"], factory=BUILD_FACTORY
diff --git a/buildbot/restart.sh b/buildbot/restart.sh
index 03d55a3..30cf63a 100755
--- a/buildbot/restart.sh
+++ b/buildbot/restart.sh
@@ -2,10 +2,7 @@
 
 set -eu
 
-DATE=`date`
-echo "Restarting Taler deployment at $DATE"
-source "${HOME}/activate"
-taler-deployment-restart
+cd ${HOME}/deployment/docker/demo
 
-echo "Deployment ready"
-exit 0
+docker-compose stop
+docker-compose up --remove-orphans -d