diff options
| author | Charles Baylis <charles.baylis@linaro.org> | 2017-02-22 12:39:29 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-02-22 19:00:37 +0000 |
| commit | 43e86773ce14a54a8a5f02d9e12d9cd26937d90e (patch) | |
| tree | f24958504c074e4418650095066975caa85fe9d2 /tcwg-bkk16-buildfarm-benchmark.yaml | |
| parent | 167bd209a3dd9beb45c398b2768f29c27be2a719 (diff) | |
Remove workaround for /dev/pts unmount bug.
This patch removes an incorrect workaround for a bug which prevented
schroot sessions from closing correctly. The bug was solved by
a schroot configuration change (not bindmounting /dev and /dev/pts).
Change-Id: I458b0774ec90af6b3c0cdd64924cac6edba804dc
Diffstat (limited to 'tcwg-bkk16-buildfarm-benchmark.yaml')
| -rw-r--r-- | tcwg-bkk16-buildfarm-benchmark.yaml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tcwg-bkk16-buildfarm-benchmark.yaml b/tcwg-bkk16-buildfarm-benchmark.yaml index ac4c2c4d2b..b1c5b6cf3c 100644 --- a/tcwg-bkk16-buildfarm-benchmark.yaml +++ b/tcwg-bkk16-buildfarm-benchmark.yaml @@ -224,9 +224,8 @@ BUILD_SHELL="schroot -r -c session:$session_id --preserve-environment -- bash" $BUILD_SHELL -c "echo \"Build session is up; ulimit config:\"; ulimit -a" - # Sometimes /dev/pts can't get unmounted on the first try. - # Workaround by retrying. - trap "{ schroot -f -e -c session:$session_id || { sleep 60 ; schroot -f -e -c session:$session_id; } || true; }" 0 + # Remove schroot session on exit + trap "schroot -f -e -c session:$session_id" 0 git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts |