diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-10-11 09:21:08 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-10-11 09:23:23 +0000 |
| commit | eda203ba569252020f11e7c4a92bd6972d99398c (patch) | |
| tree | 686fc63238dde019825861bbb9fc97db16d2c9eb /jenkins-helpers.sh | |
| parent | b7ee25a420f3c28e650906a90a4cf7beac093ced (diff) | |
jenkins-helpers.sh: Fix creation of testing containers on tcwg-apm-*.tcwglab
Tcwg-apm-*.tcwglab machines (and, generally, most *.tcwglab configured by
Lab) tend to use "dash" shell for infrastructure users tcwg-buildslave
and tcwg-benchmark. Dash does not expand "*" wildcard, so we don't get
ssh host keys inside containers, which cause ssh to fail.
Fix by using more portable "find".
Change-Id: I08127c973ce0c0f956465d4706ae1d3769888c54
Diffstat (limited to 'jenkins-helpers.sh')
| -rw-r--r-- | jenkins-helpers.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jenkins-helpers.sh b/jenkins-helpers.sh index e02c492b..988b0a0c 100644 --- a/jenkins-helpers.sh +++ b/jenkins-helpers.sh @@ -736,7 +736,8 @@ print_bind_mounts () esac local key - for key in $($ssh "ls /etc/ssh/ssh_host_*_key{,.pub}"); do + for key in $($ssh find /etc/ssh/ -name "ssh_host_*_key" \ + -o -name "ssh_host_*_key.pub"); do bind_mounts+=("$key:ro") done |