diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-04 20:15:33 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-04 20:15:33 +0000 |
| commit | 7c1af393ad29cba9550ab4acede1d5840ed48537 (patch) | |
| tree | ef6b406c9dd939f4b70c51c64005a6e75a3ab40d /tcwg-abe-extended | |
| parent | 54ea52ee9700f8e188507e05bd64ea818c4e6822 (diff) | |
Revert "Revert "tcwg-*: Switch to use *-tcwg-tested docker images.""
This reverts commit 54ea52ee9700f8e188507e05bd64ea818c4e6822.
Change-Id: I6e637741d45fd395ff505b0477ae93f54eb4e48c
Diffstat (limited to 'tcwg-abe-extended')
| -rwxr-xr-x | tcwg-abe-extended/builders.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tcwg-abe-extended/builders.sh b/tcwg-abe-extended/builders.sh index 97b06a56..07b5405d 100755 --- a/tcwg-abe-extended/builders.sh +++ b/tcwg-abe-extended/builders.sh @@ -4,7 +4,7 @@ set -ex . ./jenkins-scripts/jenkins-helpers.sh -./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh +./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --task build --prefix build_ > build-container.sh . ./build-container.sh trap "build_container_cleanup" EXIT HUP INT QUIT TRAP PIPE TERM BUILD_SHELL="build_container_exec bash" @@ -54,7 +54,7 @@ case "$testname" in cross_linux_*) target=arm-linux-gnueabihf tester_label=$(print_tester_label_for_target $target) - bash -x ./jenkins-scripts/start-container-docker.sh --label $tester_label --distro trusty --task test --prefix test_ > test-container.sh + bash -x ./jenkins-scripts/start-container-docker.sh --label $tester_label --task test --prefix test_ > test-container.sh . ./test-container.sh trap "build_container_cleanup; test_container_cleanup" EXIT HUP INT QUIT TRAP PIPE TERM testcontainer_opt="--testcontainer ${test_container_host}:${test_container_port}" |