diff options
author | Christophe Lyon <christophe.lyon@linaro.org> | 2017-03-31 18:41:35 +0000 |
---|---|---|
committer | Christophe Lyon <christophe.lyon@linaro.org> | 2017-03-31 18:41:35 +0000 |
commit | 7f779041777f13f1af0f414ca8d9f196e37bb656 (patch) | |
tree | 0f2dccf2ff41eb39cb6030f83f03e2ea33e6f6bd /tcwg-buildapp-christophe.yaml | |
parent | 3fda28f8d1747193cb2e15d07bc2016ad853c4a8 (diff) |
tcwg-buildapp-christophe: Add ssh-agent cleanup.
Change-Id: Iff55963de4a24ff630376136463824ef911ebd70
Diffstat (limited to 'tcwg-buildapp-christophe.yaml')
-rw-r--r-- | tcwg-buildapp-christophe.yaml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tcwg-buildapp-christophe.yaml b/tcwg-buildapp-christophe.yaml index 0fb69ac9cc..f5402c48f9 100644 --- a/tcwg-buildapp-christophe.yaml +++ b/tcwg-buildapp-christophe.yaml @@ -111,7 +111,11 @@ # Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port . ./container.sh - trap "${CONTAINER_CLEANUP}" EXIT + if [ x"${SSH_AGENT_CLEANUP}" = x ]; then + trap "${CONTAINER_CLEANUP}" EXIT + else + trap "${CONTAINER_CLEANUP} ; eval \`${SSH_AGENT_CLEANUP}\`" EXIT + fi env | egrep 'LAVA|BUILD_NUMBER|PUBLISH_TOKEN' > .env ${CONTAINER} "cd ${WORKSPACE} && ${WORKSPACE}/tcwg-buildapp.sh ${toolchain_url} ${app} ${target} ${boot} ${linux_repo} ${linux_branch}" |