taler-deployment

commit 8d0574d7313882e8a75d0e21ee9bafc048230fb1
parent 3fbfe1e9f0daa8421e7578634fe8147343b64476
Author: Devan Carpenter <devan@taler.net>
Date:   Mon, 12 Jun 2023 16:42:59 -0400

buildbot: cleanup container run function

Diffstat:
M
buildbot/master.cfg
 | 
16
+++++++++-------

1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -163,19 +163,19 @@ def update_deployment(factory):
 
 
 # Convenience function that builds and runs a container.
-def container_run_step(factory, WORK_DIR, containerName,
-                       containerFile="ci/Containerfile",
-                       jobCmd="/workdir/ci/ci.sh"):
+def container_run_step(stepName, factory, WORK_DIR, containerName,
+                       jobCmd="/workdir/ci/ci.sh",
+                       containerFile="ci/Containerfile"):
     factory.addStep(steps.ShellSequence(
-        name="container build and run",
+        name=stepName,
         commands=[
             util.ShellArg(command=["podman", "build", "-t", containerName,
                                    "-f", containerFile, "."],
                           logname='build container', haltOnFailure=True),
             util.ShellArg(command=["podman", "run", "-ti", "--rm", "--volume",
-                                   "$PWD:/workdir", "--workdir", "/workdir",
+                                   f"{WORK_DIR}:/workdir", "--workdir", "/workdir",
                                    containerName, jobCmd],
-                          logname='run container step', haltOnFailure=True),
+                          logname='run inside container', haltOnFailure=True),
         ],
         haltOnFailure=True,
         workdir=WORK_DIR
@@ -1228,7 +1228,9 @@ for reponame in container_repos:
     ))
 
     # Run container step with default commands
-    container_run_step(container_factory, CONTAINER_WORKDIR, reponame)
+    container_run_step("Build docs",
+                       container_factory, CONTAINER_WORKDIR, reponame,
+                       "ci/jobs/docs.sh")
 
     BUILDERS.append(util.BuilderConfig(
         name=f"{reponame}-builder",