diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2015-05-27 13:48:42 +0200 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2015-05-27 11:50:23 +0000 |
| commit | 8e2a626000c0124c5045a5707b0fbbe6bbd0eaa2 (patch) | |
| tree | 54bdda9c370daca31b6cc5b8b137b1c49333df3f /tcwg-buildfarm-master.yaml | |
| parent | 01ec9da86ae58e0ba4473cbcedd2b6fcfe01afb6 (diff) | |
tcwg-buildfarm-{master,test-builder}: Call jenkins.sh directly.
Change-Id: If8ed120e0b95a0ddc8a08cae1dcc7756b9db9101
Diffstat (limited to 'tcwg-buildfarm-master.yaml')
| -rw-r--r-- | tcwg-buildfarm-master.yaml | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/tcwg-buildfarm-master.yaml b/tcwg-buildfarm-master.yaml index 152aea93b3..317e32c81a 100644 --- a/tcwg-buildfarm-master.yaml +++ b/tcwg-buildfarm-master.yaml @@ -79,14 +79,25 @@ - shell: | #!/bin/bash - trap cleanup_exit INT TERM EXIT + set -e + set -x - cleanup_exit() - { - cd ${WORKSPACE} - } + case ${target} in + schroot-*) + schroot_arch=$(echo ${target} | sed -e "s/^schroot-\([^-]*\)-\(.*\)/\1/") + target=$(echo ${target} | sed -e "s/^schroot-\([^-]*\)-\(.*\)/\2/") + ;; + *) + case $(uname -m) in + x86_64) schroot_arch="amd64" ;; + aarch64) schroot_arch="arm64" ;; + *) echo "Unexpected architecture $(uname -m)"; exit 1 ;; + esac + ;; + esac + BUILD_SHELL="schroot -c tcwg-build-${schroot_arch}-trusty --preserve-environment -- bash" - bash -x ${WORKSPACE}/scripts/BuildFarm.job + ${BUILD_SHELL} -x ./jenkins.sh --target ${target} --gcc-branch ${gcc_branch} --languages ${languages} ${try_bootstrap:+ --bootstrap} --runtests ${excludecheck:+ --excludecheck ${excludecheck}} publishers: - email: recipients: 'christophe.lyon@linaro.org' |