diff options
| author | Diana Picus <diana.picus@linaro.org> | 2017-08-08 13:40:53 +0200 |
|---|---|---|
| committer | Diana Picus <diana.picus@linaro.org> | 2017-08-08 13:40:53 +0200 |
| commit | 89b00fdeab9c12fef25e76480c223378fe9ac0c4 (patch) | |
| tree | dd04fa7324d39a001a576e8a27ce9e5685cf6f06 /tcwg-llvm-testsuite.yaml | |
| parent | a1227ba12a381cb9c33009cc04cfa0ec343f4b4a (diff) | |
tcwg-llvm-testsuite.yaml: Simplify
Start-container-docker sets container $arch and $session_host from
--label and --node settings, which are readily available.
Patch by Maxim Kuvyrkov.
Change-Id: I77fd19609fdb70a7da2d963a4b5b8db397acc6ff
Diffstat (limited to 'tcwg-llvm-testsuite.yaml')
| -rw-r--r-- | tcwg-llvm-testsuite.yaml | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/tcwg-llvm-testsuite.yaml b/tcwg-llvm-testsuite.yaml index ac4ed97864..32be3cf1d2 100644 --- a/tcwg-llvm-testsuite.yaml +++ b/tcwg-llvm-testsuite.yaml @@ -88,23 +88,8 @@ exit 1 fi - # Select builder arch/type/container - case ${label} in - tcwg-x86_64-build|tcwg-x86_64-cam) - builder_arch=amd64 - ;; - tcwg-tk1_32-build) - builder_arch=armhf - ;; - tcwg-apm_64-build) - builder_arch=arm64 - ;; - *) echo "ERROR: Unsupported label: $label"; exit 1 ;; - esac - # Start build container - builder=$(print_host_for_node $NODE_NAME) - bash ${WORKSPACE}/start-container-docker.sh --arch ${builder_arch} --distro ${build_container_tag} --session-host ${builder} --prefix build_ > build-container.sh + ${WORKSPACE}/start-container-docker.sh --label ${label} --node ${NODE_NAME} --distro ${build_container_tag} --prefix build_ > build-container.sh # Define build_CONTAINER_RSH and build_container_cleanup . ./build-container.sh |