diff options
author | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2023-11-02 16:03:10 +0100 |
---|---|---|
committer | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2023-11-03 11:01:22 +0100 |
commit | ca5bf48cfa9efb51be18698594eedb203aa981a9 (patch) | |
tree | 61eb5dae888512d998225a89d0a189644658558c /tcwg-base | |
parent | 1b7c798ba1bae75bcac3a441fa413951c96b8539 (diff) |
tcwg-host/start.sh : No check of docker version for tx1 boards
Change-Id: I6467a75404f6f505a137e4f4ba499495b1aa2689
Diffstat (limited to 'tcwg-base')
-rwxr-xr-x | tcwg-base/tcwg-host/start.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tcwg-base/tcwg-host/start.sh b/tcwg-base/tcwg-host/start.sh index cdd808a0..3e1aeaf4 100755 --- a/tcwg-base/tcwg-host/start.sh +++ b/tcwg-base/tcwg-host/start.sh @@ -81,8 +81,9 @@ done memlimit=$(free -m | awk '/^Mem/ { print $2 }') memlimit=$(($memlimit / 2))m -case "$(uname -m):$($DOCKER --version | cut -d" " -f3)" in - armv7l:18*) +case "$(uname -r):$(uname -m):$($DOCKER --version | cut -d" " -f3)" in + *:armv7l:18*|\ + 4.4.38-tegra:aarch64:18*) # Somewhere between docker-ce 19.03.5 and 19.03.6 docker bridge network # got broken on, at least, armhf with 3.10 kernel (aka TK1s). # At the same time to run ubuntu:focal we need docker-ce 19.03.9-ish @@ -92,13 +93,13 @@ case "$(uname -m):$($DOCKER --version | cut -d" " -f3)" in # disabling it via --privileged option. # 2. Use new docker and workaround broken bridge network by using # --network host. - # In the case of tcwg-tk1-* boards, which are used for jenkins CI, we - # need the bridge network, so we choose (1). + # In the case of tcwg-tk1-* and tcwg-tx1-* boards, which are used + # for jenkins CI, we need the bridge network, so we choose (1). workaround="--privileged" ;; - aarch64:[0-9].*|\ - aarch64:1[0-9].*|\ - aarch64:2[0123].*) + *:aarch64:[0-9].*|\ + *:aarch64:1[0-9].*|\ + *:aarch64:2[0123].*) # On aarch64 servers (which we generally use both in aarch64 # and aarch32 modes), we require a recent-enough docker. # Docker from Ubuntu 20.04 had problems with some syscalls in |