Merge pull request #294 from spinframework/refactor-node-installer

node-installer: refactor the integration tests

Author: Mossaka

node-installer/Makefile

@@ -1,7 +1,21 @@
 SPIN_VERSION = v2
 IMAGE_NAME ?= ghcr.io/spinkube/containerd-shim-spin/node-installer
-PLATFORM ?= linux/amd64
-ARCH ?= x86_64
+
+# we only support x86_64 and aarch64 on Linux
+UNAME := $(shell uname -m)
+ifeq ($(UNAME),x86_64)
+  PLATFORM ?= linux/amd64
+  ARCH ?= x86_64
+else ifeq ($(UNAME),aarch64)
+  PLATFORM ?= linux/arm64
+  ARCH ?= aarch64
+else ifeq ($(UNAME),arm64)
+  PLATFORM ?= linux/arm64
+  ARCH ?= aarch64
+else
+  $(error Unsupported platform: $(UNAME))
+endif
+
 TARGET ?= $(ARCH)-unknown-linux-musl
 BINARY := ./.tmp/$(PLATFORM)/containerd-shim-spin-$(SPIN_VERSION)
 

node-installer/tests/integration-test-k3s.sh

@@ -21,19 +21,7 @@ kubectl apply -f ./tests/workloads/runtime.yaml
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
 if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
   echo "Building node installer image..."
-  PLATFORM=$(uname -m)
-  if [ "$PLATFORM" = "x86_64" ]; then
-    PLATFORM="linux/amd64"
-    ARCH="x86_64"
-  elif [ "$PLATFORM" = "aarch64" ] || [ "$PLATFORM" = "arm64" ]; then
-    PLATFORM="linux/arm64"
-    ARCH="aarch64"
-  else
-    echo "Unsupported platform: $PLATFORM"
-    exit 1
-  fi
-  
-  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
+  IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
 fi
 
 echo "Loading node installer image into K3s..."

node-installer/tests/integration-test-kind.sh

@@ -30,19 +30,7 @@ kubectl --context=kind-spin-test apply -f ./tests/workloads/runtime.yaml
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
 if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
   echo "Building node installer image..."
-  PLATFORM=$(uname -m)
-  if [ "$PLATFORM" = "x86_64" ]; then
-    PLATFORM="linux/amd64"
-    ARCH="x86_64"
-  elif [ "$PLATFORM" = "aarch64" ] || [ "$PLATFORM" = "arm64" ]; then
-    PLATFORM="linux/arm64"
-    ARCH="aarch64"
-  else
-    echo "Unsupported platform: $PLATFORM"
-    exit 1
-  fi
-  
-  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
+  IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
 fi
 
 echo "Loading node installer image into kind..."

node-installer/tests/integration-test-microk8s.sh

@@ -30,19 +30,7 @@ kubectl apply -f ./tests/workloads/runtime.yaml
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
 if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
   echo "Building node installer image..."
-  PLATFORM=$(uname -m)
-  if [ "$PLATFORM" = "x86_64" ]; then
-    PLATFORM="linux/amd64"
-    ARCH="x86_64"
-  elif [ "$PLATFORM" = "aarch64" ] || [ "$PLATFORM" = "arm64" ]; then
-    PLATFORM="linux/arm64"
-    ARCH="aarch64"
-  else
-    echo "Unsupported platform: $PLATFORM"
-    exit 1
-  fi
-  
-  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
+  IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
 fi
 
 echo "Loading node installer image into MicroK8s..."

node-installer/tests/integration-test-minikube.sh

@@ -14,19 +14,7 @@ kubectl apply -f ./tests/workloads/runtime.yaml
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
 if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
   echo "Building node installer image..."
-  PLATFORM=$(uname -m)
-  if [ "$PLATFORM" = "x86_64" ]; then
-    PLATFORM="linux/amd64"
-    ARCH="x86_64"
-  elif [ "$PLATFORM" = "aarch64" ] || [ "$PLATFORM" = "arm64" ]; then
-    PLATFORM="linux/arm64"
-    ARCH="aarch64"
-  else
-    echo "Unsupported platform: $PLATFORM"
-    exit 1
-  fi
-  
-  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
+  IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
 fi
 
 echo "Loading node installer image into MiniKube..."