diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2019-03-25 09:42:13 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2019-03-25 10:09:10 +0000 |
| commit | 2fd1e2bcf8ffee502dcbfc7f2f9e4ba705b72466 (patch) | |
| tree | 1aa0a9f8fe7f3f990f274f631c2e74609ad09034 /docker-run.sh | |
| parent | 954b5213435bb4e25b0fea128f59d0ccd2f5c383 (diff) | |
docker-run.sh, jenkins-helpers.sh: Fix use of flock
flock expects a real command as argument, not a shell function, so the
scripts are currently broken:
flock: failed to execute container_exec: No such file or directory
This patch defines the JENKINS_FLOCK helper variable which is expanded
by the remote_exec() shell helper.
Change-Id: Ie5117d1116c9bbc9b556bc25946a7a0afc706ea2
Diffstat (limited to 'docker-run.sh')
| -rwxr-xr-x | docker-run.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker-run.sh b/docker-run.sh index 72cadaee..19620ab5 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -23,9 +23,9 @@ if [ "x$WORKSPACE" != "x" ]; then echo "ERROR: WORKSPACE $WORKSPACE does not exist" exit 1 fi - FLOCK="flock $WORKSPACE" + JENKINS_FLOCK="flock $WORKSPACE" else - FLOCK="" + JENKINS_FLOCK="" fi -$FLOCK container_exec "$@" +container_exec "$@" |