From 38242ab31f9958a0b618600edbb3136be1cda384 Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Mon, 4 Mar 2024 10:19:04 -0500 Subject: buildbot: make revision property string robust --- buildbot/master.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 188de9f..8b06b9f 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -203,7 +203,7 @@ def container_add_step(HALT_ON_FAILURE, "--arch", CONTAINER_ARCH, "--add-host", "taler.host.internal:10.0.2.2", "--network", "slirp4netns:allow_host_loopback=true", - "--env", util.Interpolate("CI_COMMIT_REF=%(src::revision)s"), + "--env", util.Interpolate("CI_COMMIT_REF=%(prop:got_revision:-%(src::revision:-unknown)s)s"), "--env", util.Interpolate("CI_GIT_BRANCH=%(src::branch)s"), "--volume", f"{WORK_DIR}:/workdir", "--volume", "/home/container-worker/container_artifacts:/artifacts", @@ -227,7 +227,7 @@ def container_add_step(HALT_ON_FAILURE, "--arch", CONTAINER_ARCH, "--add-host", "taler.host.internal:10.0.2.2", "--network", "slirp4netns:allow_host_loopback=true", - "--env", util.Interpolate("CI_COMMIT_REF=%(src::revision)s"), + "--env", util.Interpolate("CI_COMMIT_REF=%(prop:got_revision:-%(src::revision:-unknown)s)s"), "--env", util.Interpolate("CI_GIT_BRANCH=%(src::branch)s"), "--volume", f"{WORK_DIR}:/workdir", "--volume", "/home/container-worker/container_artifacts:/artifacts", -- cgit v1.2.3