From d132f0d95d1aa7438ea796ec86612faba7173ae9 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Tue, 23 Mar 2021 10:30:27 +0000
Subject: prepare-board.sh: Copy up-to-date docker-wrapper to /usr/local/bin

... so that we can find it with default PATH settings.

Change-Id: Ia74e17fdb8b99666ffb61f32a2df4f114aeb3c29
---
 prepare-board.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'prepare-board.sh')

diff --git a/prepare-board.sh b/prepare-board.sh
index edb2805..cbe5f7f 100755
--- a/prepare-board.sh
+++ b/prepare-board.sh
@@ -424,13 +424,10 @@ configure_ntp()
 # Check that docker can start a container.
 test_docker()
 {
-    # We run this script under as root, so don't have tcwg-benchmark's $PATH
-    # in our environment.  Use docker-wrapper via absolute path.
-    local docker=/home/tcwg-benchmark/bin/docker-wrapper
-    $docker ps
+    docker-wrapper ps
     if [ x"$DOCKER_IMAGE" != x"" ]; then
-	$docker maybepull "$DOCKER_IMAGE"
-	$docker run --rm --entrypoint=/bin/sh "$DOCKER_IMAGE"
+	docker-wrapper maybepull "$DOCKER_IMAGE"
+	docker-wrapper run --rm --entrypoint=/bin/sh "$DOCKER_IMAGE"
     fi
     verbose "Docker seems to be OK"
 }
@@ -445,6 +442,12 @@ configure_docker()
     local cnt
 
     if [ "$op" = "start_board" ]; then
+	# We have up-to-date docker-wrapper under /home/tcwg-benchmark/bin
+	# thanks to tcwg-infra-update-home job, and now copy it to
+	# /usr/local/bin/ so that it overrides /usr/bin/docker.
+	cp /home/tcwg-benchmark/bin/docker-wrapper /usr/local/bin/
+	cp /home/tcwg-benchmark/bin/docker /usr/local/bin/
+
 	# Retry on occasional failures from docker.
 	test_docker &
 	if ! wait $!; then
-- 
cgit v1.2.3