From 79012481fa8646c9e185365514052e57cfaf8c48 Mon Sep 17 00:00:00 2001
From: Seunguk Shin <seunguk.shin@arm.com>
Date: Wed, 15 Jan 2025 17:15:46 +0000
Subject: [PATCH] ci: Enable ccruntime-e2e and makefile test on arm64

Signed-off-by: Seunguk Shin <seunguk.shin@arm.com>
Reviewed-by: Nick Connolly <nick.connolly@arm.com>
Reviewed-by: Tao Xu <tao.xu@arm.com>
---
 .github/workflows/ccruntime_e2e.yaml |  6 +++++-
 .github/workflows/makefile.yaml      | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ccruntime_e2e.yaml b/.github/workflows/ccruntime_e2e.yaml
index 2f73ba0b..c0f92dca 100644
--- a/.github/workflows/ccruntime_e2e.yaml
+++ b/.github/workflows/ccruntime_e2e.yaml
@@ -28,6 +28,7 @@ jobs:
           - "tdx"
           - "sev"
           - "sev-snp"
+          - "ubuntu-22.04-arm"
         exclude:
           - runtimeclass: "kata-qemu"
             instance: "tdx"
@@ -70,13 +71,16 @@ jobs:
           if [ $RUNNING_INSTANCE = "s390x-large" ]; then
             args=""
             export pre_install_payload_archs="linux/s390x"
-          elif [ "$RUNNING_INSTANCE" == "ubuntu-20.04" ] || [ "$RUNNING_INSTANCE" == "ubuntu-22.04" ]; then
+          elif [[ "$RUNNING_INSTANCE" == "ubuntu-"* ]] || [[ "$RUNNING_INSTANCE" == "arm64-nvidia-gpu" ]]; then
             # Remove the pre-installed docker/containerd
             sudo apt-get remove docker* containerd* -y
             # Use /mnt to store images
             sudo rm -Rf /var/lib/docker || true
             sudo mkdir /mnt/docker || true
             sudo ln -s /mnt/docker /var/lib/docker || true
+            if [ "$RUNNING_INSTANCE" == "ubuntu-22.04-arm" ] || [ "$RUNNING_INSTANCE" == "arm64-nvidia-gpu" ]; then
+              export pre_install_payload_archs="linux/arm64"
+            fi
           fi
           ./run-local.sh -t -r "${{ matrix.runtimeclass }}" "${args}"
         env:
diff --git a/.github/workflows/makefile.yaml b/.github/workflows/makefile.yaml
index 91382936..60856d86 100644
--- a/.github/workflows/makefile.yaml
+++ b/.github/workflows/makefile.yaml
@@ -9,7 +9,12 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        instance:
+          - "ubuntu-22.04"
+          - "ubuntu-22.04-arm"
+    runs-on: ${{ matrix.instance }}
 
     steps:
     - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
@@ -43,13 +48,16 @@ jobs:
 
   envtest:
     name: Test APIs using envtest
-    runs-on: ubuntu-22.04
     strategy:
       matrix:
+        instance:
+          - "ubuntu-22.04"
+          - "ubuntu-22.04-arm"
         version:
           - 1.30.x
           - 1.31.x
           - 1.32.x
+    runs-on: ${{ matrix.instance }}
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5