diff options
| author | Devan Carpenter <devan@taler.net> | 2024-03-04 10:19:04 -0500 |
|---|---|---|
| committer | Devan Carpenter <devan@taler.net> | 2024-03-04 10:19:33 -0500 |
| commit | 38242ab31f9958a0b618600edbb3136be1cda384 (patch) | |
| tree | 3aeefa97f0a91de984b56442e25ac5fb13320b67 | |
| parent | e5f59f69dda71b17d4a1d3cc07f893c0d0234fb5 (diff) | |
| download | deployment-38242ab31f9958a0b618600edbb3136be1cda384.tar.gz deployment-38242ab31f9958a0b618600edbb3136be1cda384.tar.bz2 deployment-38242ab31f9958a0b618600edbb3136be1cda384.zip | |
buildbot: make revision property string robust
| -rw-r--r-- | buildbot/master.cfg | 4 |
1 files 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", |