[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated: buildbot: cleanup container ru
From: |
gnunet |
Subject: |
[taler-deployment] branch master updated: buildbot: cleanup container run function |
Date: |
Mon, 12 Jun 2023 22:43:14 +0200 |
This is an automated email from the git hooks/post-receive script.
devan-carpenter pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new 8d0574d buildbot: cleanup container run function
8d0574d is described below
commit 8d0574d7313882e8a75d0e21ee9bafc048230fb1
Author: Devan Carpenter <devan@taler.net>
AuthorDate: Mon Jun 12 16:42:59 2023 -0400
buildbot: cleanup container run function
---
buildbot/master.cfg | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index bfd3e31..734831e 100644
--- 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",
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-deployment] branch master updated: buildbot: cleanup container run function,
gnunet <=