diff options
| author | David Spickett <david.spickett@linaro.org> | 2020-03-30 12:41:52 +0100 |
|---|---|---|
| committer | David Spickett <david.spickett@linaro.org> | 2020-03-30 12:47:40 +0100 |
| commit | 086bec00ab110603166f51e69d7fa37ce1035111 (patch) | |
| tree | 639db05dea252b81e817e5412a12df088cdd987b /docker-run.sh | |
| parent | 79fff89c89ab9eebbfbe2880c0079d7e29eb1e87 (diff) | |
docker-run.sh: Use the correct run/cleanup
functions when --prefix is given.
Change-Id: Icf7d3227d4b1b74e610d695b83f2202b84400152
Diffstat (limited to 'docker-run.sh')
| -rwxr-xr-x | docker-run.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker-run.sh b/docker-run.sh index 92820ef5..d5b74a5d 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -14,7 +14,8 @@ case "$qemu" in *) $(dirname $0)/start-container-qemu.sh "${CONVERTED_ARGS[@]:1}" > container.sh ;; esac -trap "container_cleanup" EXIT +# Where prefix is something like "run_" or "test_" +trap "${prefix}container_cleanup" EXIT . ./container.sh # We want to use flock only when WORKSPACE exists @@ -28,4 +29,4 @@ else JENKINS_FLOCK="" fi -container_exec "$@" +${prefix}container_exec "$@" |