commit c7292ac3cd56f25f8eacf4a1d4751aa7f9a3451c
parent 7ee827486b6f53a1fed581e8d0eb2156658fd9fd
Author: Devan Carpenter <devan@taler.net>
Date: Wed, 6 Sep 2023 15:03:03 -0400
buildbot: clean git workspace for container builds
this change attempts to make the git preparation step in the container
builders idempotent and thus more predictable
Diffstat:
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -1298,8 +1298,8 @@ for repo in container_repos:
# Ensure repo is cloned or clean.
# Git() will clone repo if it doesn't exist.
- # Method fresh runs 'git clean -f -f -d -x', if checkout already exists.
- # Only works with mode='full'
+ # Method clobber removes directory and makes a fresh clone.
+ # Shallow set to "True" defaults to a depth of 1.
# Will checkout value of "branch" property from job properties.
# https://docs.buildbot.net/latest/manual/configuration/steps/source_git.html
container_factory.addStep(Git(
@@ -1307,7 +1307,9 @@ for repo in container_repos:
repourl=REPO_URL,
branch=util.Interpolate('%(src::branch)s'),
mode='full',
- method='fresh',
+ method='clobber',
+ shallow=True,
+ submodules=True,
haltOnFailure=True,
))