From c7099c0345fde603768cec6735f504c2a3292c75 Mon Sep 17 00:00:00 2001 From: Andrew Harding Date: Wed, 17 Jan 2024 19:49:44 -0700 Subject: [PATCH] Use same kubectl version as k8s Also add some arch flags to support running tests on M1/M2. Signed-off-by: Andrew Harding --- .github/workflows/pr_build.yaml | 2 +- .github/workflows/release_build.yaml | 2 +- Makefile | 2 ++ test/run.sh | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr_build.yaml b/.github/workflows/pr_build.yaml index ddeb3fe..677a24e 100644 --- a/.github/workflows/pr_build.yaml +++ b/.github/workflows/pr_build.yaml @@ -83,7 +83,7 @@ jobs: tar xvf images.tar.gz make load-images - name: Run integration tests - run: K8S_VERSION=${{ matrix.k8s-version }} test/run.sh + run: K8S_VERSION=${{ matrix.k8s-version }} KUBECTL_VERSION=${{ matrix.k8s-version }} test/run.sh success: runs-on: ubuntu-22.04 diff --git a/.github/workflows/release_build.yaml b/.github/workflows/release_build.yaml index aa0a650..2862518 100644 --- a/.github/workflows/release_build.yaml +++ b/.github/workflows/release_build.yaml @@ -83,7 +83,7 @@ jobs: tar xvf images.tar.gz make load-images - name: Run integration tests - run: K8S_VERSION=${{ matrix.k8s-version }} test/run.sh + run: K8S_VERSION=${{ matrix.k8s-version }} KUBECTL_VERSION=${{ matrix.k8s-version }} test/run.sh publish: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 61fbd71..0941cfd 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,8 @@ ifeq ($(arch1),x86_64) arch2=amd64 else ifeq ($(arch1),aarch64) arch2=arm64 +else ifeq ($(arch1),arm64) +arch2=arm64 else $(error unsupported ARCH: $(arch1)) endif diff --git a/test/run.sh b/test/run.sh index 0be0c69..9d10471 100755 --- a/test/run.sh +++ b/test/run.sh @@ -42,7 +42,7 @@ esac ARCH=$(uname -m) case "${ARCH}" in x86_64) ARCH=amd64 ;; - aarch64) ARCH2=arm64 ;; + arm64|aarch64) ARCH2=arm64 ;; *) echo "unsupported ARCH: ${ARCH}" 1>&2 exit 1