aboutsummaryrefslogtreecommitdiff
path: root/tcwg-buildapp.yaml
diff options
context:
space:
mode:
authorCharles Baylis <charles.baylis@linaro.org>2017-06-14 09:18:04 +0100
committerCharles Baylis <charles.baylis@linaro.org>2017-06-14 09:52:33 +0100
commitbdc7bc152983065d4dca610ae39ec811258ea948 (patch)
treeddcbf604c79983c1a2577feefe11e7430f3e5199 /tcwg-buildapp.yaml
parentebdf09bceebf1b7b143c382c3ed3a5275c789534 (diff)
downloadconfigs-bdc7bc152983065d4dca610ae39ec811258ea948.tar.gz
tcwg-buildapp{,-christophe}: use jenkins-helpers.sh
Replace internal implementation of print_arch_for_label() with call to same. Use print_host_for_node() instead of nodename2hostname.sh. Change-Id: Icab068fc1dbff0a3c4c8c65ce3f424692c9684e1
Diffstat (limited to 'tcwg-buildapp.yaml')
-rw-r--r--tcwg-buildapp.yaml13
1 files changed, 4 insertions, 9 deletions
diff --git a/tcwg-buildapp.yaml b/tcwg-buildapp.yaml
index 72af3ed26..f2c1acaac 100644
--- a/tcwg-buildapp.yaml
+++ b/tcwg-buildapp.yaml
@@ -85,16 +85,11 @@
env
ssh-add -l
git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts
- case ${label} in
- tcwg-x86_64-build) host_arch=amd64 ;;
- tcwg-x86_32-build) host_arch=i386 ;;
- tcwg-tx1_64-build) host_arch=arm64 ;;
- tcwg-tx1_32-build) host_arch=armhf ;;
- tcwg-tk1_32-build) host_arch=armhf ;;
- *) echo "ERROR: Unsupported slave: $slave"; exit 1 ;;
- esac
- host=$(./jenkins-scripts/nodename2hostname.sh $NODE_NAME)
+ . jenkins-scripts/jenkins-helpers.sh
+ host_arch=$(print_arch_for_label "${label}")
+ host=$(print_host_for_node $NODE_NAME)
+
bash -x ./jenkins-scripts/start-container-docker.sh --arch ${host_arch} --distro trusty --session-host ${host} > container.sh
# Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port