diff options
author | Christophe Lyon <christophe.lyon@linaro.org> | 2017-07-16 23:09:14 +0000 |
---|---|---|
committer | Christophe Lyon <christophe.lyon@linaro.org> | 2017-07-16 23:09:14 +0000 |
commit | 838d741697d56e760fcadc8b9b8d0384a190fcd7 (patch) | |
tree | c1eeb945493f733450370d5bd84a411026029fcc /tcwg-test-release.yaml | |
parent | e0cc938d1db5b293adcfca5cd2c3ed763d670e0d (diff) |
tcwg-test-release: Select container arch based on tarball name.
Start in i386 container if the tarball file name has '-i686',
and an amd64 one if the tarball name has -'x86_64'.
Change-Id: Ie4c337c77472982436aaac71f7997f9f4c6f5c33
Diffstat (limited to 'tcwg-test-release.yaml')
-rw-r--r-- | tcwg-test-release.yaml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tcwg-test-release.yaml b/tcwg-test-release.yaml index 065fcb49..5510fb1f 100644 --- a/tcwg-test-release.yaml +++ b/tcwg-test-release.yaml @@ -90,8 +90,16 @@ # Start build container builder=$(print_host_for_node $NODE_NAME) build_container_type=docker - # We currently test i686 releases on x86_64 hosts - builder_arch=amd64 + # Use tarball name to decide if we use an i386 container or an amd64 one + tarball_file=$(basename ${tarball_url}) + case ${tarball_file} in + *-i686*) builder_arch=i386 ;; + *-x86_64*) builder_arch=amd64 ;; + *) + echo "ERROR: could not determine container type from tarball ${tarball_file}" + exit 1 + ;; + esac bash -x ${WORKSPACE}/start-container-${build_container_type}.sh --arch ${builder_arch} --distro ${build_container_tag} --session-host ${builder} > build-container.sh # Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port |