From 2f6b5ada712308489ce9063160bc2db50d2c3c75 Mon Sep 17 00:00:00 2001 From: Laura Brehm Date: Thu, 25 Jan 2024 15:07:19 +0000 Subject: [PATCH] scripts: don't hardcode architecture in e2e script Signed-off-by: Laura Brehm (cherry picked from commit 1c4d6d85dd2563e36b1687a84a687463f0302e5a) Signed-off-by: Sebastiaan van Stijn --- scripts/test/e2e/run | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/test/e2e/run b/scripts/test/e2e/run index 54e1d61e8a..e2c651ea80 100755 --- a/scripts/test/e2e/run +++ b/scripts/test/e2e/run @@ -2,6 +2,8 @@ # Run integration tests against the latest docker-ce dind set -eu -o pipefail +source ./scripts/build/.variables + container_ip() { local cid=$1 local network=$2 @@ -69,7 +71,7 @@ runtests() { GOPATH="$GOPATH" \ PATH="$PWD/build/:/usr/bin:/usr/local/bin:/usr/local/go/bin" \ HOME="$HOME" \ - DOCKER_CLI_E2E_PLUGINS_EXTRA_DIRS="$PWD/build/plugins-linux-amd64" \ + DOCKER_CLI_E2E_PLUGINS_EXTRA_DIRS="$PWD/build/plugins-linux-${GOARCH}" \ GO111MODULE=auto \ "$(command -v gotestsum)" -- ${TESTDIRS:-./e2e/...} ${TESTFLAGS-} }