diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-04-27 09:56:17 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-05-02 16:00:29 +0000 |
| commit | 3311e4e9e8893362d540472d322c10fa2afe1a5f (patch) | |
| tree | 2f06fae3b13857e7c94e5dec349d40faccdd715f | |
| parent | c4d228139d2acb1066b87b8b2c426812a2c1a2a6 (diff) | |
tcwg-validate-abetests: Convert to use docker from schroot.
Change-Id: Ia2a64d3644203a2f2d1b15995e447d1b16e2690c
| -rw-r--r-- | tcwg-validate-abetests.yaml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tcwg-validate-abetests.yaml b/tcwg-validate-abetests.yaml index 7eb41e4cb1..4b3f20a64f 100644 --- a/tcwg-validate-abetests.yaml +++ b/tcwg-validate-abetests.yaml @@ -13,6 +13,11 @@ - build-discarder: days-to-keep: 30 num-to-keep: 100 + parameters: + - string: + name: scripts_branch + default: master + description: 'Jenkins-scripts branch to use' disabled: false node: tcwg-x86_64-build retry-count: 3 @@ -76,15 +81,15 @@ set -e - schroot_arch=amd64 - schroot_image="tcwg-build-${schroot_arch}-trusty" + git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts - session_id=$(schroot -b -c chroot:$schroot_image --preserve-environment) - BUILD_SHELL="schroot -r -c session:$session_id --preserve-environment -- bash" + ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh + . ./build-container.sh + BUILD_SHELL="build_container_exec bash" $BUILD_SHELL -c "echo \"Build session is up; ulimit config:\"; ulimit -a" - # Remove schroot session on exit - trap "schroot -f -e -c session:$session_id" 0 1 2 3 5 9 13 15 + # Remove container on exit + trap "build_container_cleanup" 0 1 2 3 5 9 13 15 case "$test" in abe-tests) |