From bdc7bc152983065d4dca610ae39ec811258ea948 Mon Sep 17 00:00:00 2001 From: Charles Baylis Date: Wed, 14 Jun 2017 09:18:04 +0100 Subject: 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 --- tcwg-buildapp.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'tcwg-buildapp.yaml') diff --git a/tcwg-buildapp.yaml b/tcwg-buildapp.yaml index 72af3ed268..f2c1acaac0 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 -- cgit v1.2.3