Optimized CI to reduce testing time

.github/workflows/test-board.yml

@@ -8,27 +8,18 @@ jobs:
     strategy:
       matrix:
         include:
-          # - board: phytiumpi
-          #   vmconfigs: .github/workflows/vmconfigs/linux.toml,.github/workflows/vmconfigs/arceos.toml
-          #   vmconfigs_name: Linux + ArceOS
           - board: phytiumpi
             vmconfigs: configs/vms/arceos-aarch64-e2000-smp1.toml
             vmconfigs_name: ArceOS
-            vmimage_name: phytiumpi_arceos
           - board: phytiumpi
             vmconfigs: configs/vms/linux-aarch64-e2000-smp1.toml
             vmconfigs_name: Linux
-            vmimage_name: phytiumpi_linux
           - board: roc-rk3568-pc
             vmconfigs: configs/vms/arceos-aarch64-rk3568-smp1.toml
             vmconfigs_name: ArceOS
-            # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...]
-            vmimage_name: roc-rk3568-pc_arceos
           - board: roc-rk3568-pc
             vmconfigs: configs/vms/linux-aarch64-rk3568-smp1.toml
             vmconfigs_name: Linux
-            # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...]
-            vmimage_name: roc-rk3568-pc_linux
       fail-fast: false
     runs-on:
       - self-hosted
@@ -42,22 +33,6 @@ jobs:
       - name: Install dependencies
         run: cargo +stable install ostool --version ^0.8
 
-      - name: Download images and patch VM configs
-        run: |
-          echo "Downloading guest images and patching VM config files..."
-          IFS=',' read -ra CONFIGS <<< "${{ matrix.vmconfigs }}"
-          IFS=',' read -ra IMAGES <<< "${{ matrix.vmimage_name }}"
-          for i in "${!CONFIGS[@]}"; do
-            img="${IMAGES[$i]}"
-            img=$(echo "$img" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-            config="${CONFIGS[$i]}"
-            config=$(echo "$config" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-            cargo xtask image download $img
-            img_name="${{ matrix.board }}"
-            sed -i 's|^kernel_path[[:space:]]*=.*|kernel_path = "/tmp/axvisor/'"$img"'/'"$img_name"'"|' "$config"
-            echo "Updated kernel_path in $config"
-          done
-
       - name: Run tests
         run: |
           echo $BOARD_POWER_RESET

configs/board/phytiumpi.toml

@@ -3,6 +3,9 @@ features = [
     # "ept-level-4",
     "dyn-plat",
     "axstd/bus-mmio",
+    "fs",
+    "driver/sdmmc",
+    "driver/phytium-blk"
 ]
 log = "Info"
 target = "aarch64-unknown-none-softfloat"

configs/board/roc-rk3568-pc.toml

@@ -3,6 +3,9 @@ features = [
     # "ept-level-4",
     "dyn-plat",
     "axstd/bus-mmio",
+    "fs",
+    "driver/sdmmc",
+    "driver/rk3568-clk"
 ]
 log = "Info"
 target = "aarch64-unknown-none-softfloat"

configs/vms/arceos-aarch64-e2000-smp1.toml

@@ -20,11 +20,11 @@ phys_cpu_ids = [0x00]
 entry_point = 0x20_2008_0000
 # The location of image: "memory" | "fs".
 # Load from file system.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x20_2008_0000
 ## The file path of the kernel image.
-kernel_path = "/path/to/arceos_aarch64-dyn_smp1.bin"
+kernel_path = "/guest/arceos/phytiumpi"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x20_2000_0000
 #dtb_path = "/path/to/axvisor/configs/vms/arceos-aarch64-e2000_smp1.dtb"

configs/vms/arceos-aarch64-e2000-smp2.toml

@@ -19,11 +19,11 @@ phys_cpu_ids = [0x201, 0x100]
 entry_point = 0x20_2008_0000
 # The location of image: "memory" | "fs".
 # Load from file system.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x20_2008_0000
 ## The file path of the kernel image.
-kernel_path = "/guest/arceos/arceos_aarch64-dyn_smp2.bin"
+kernel_path = "/guest/arceos/phytiumpi"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x20_2000_0000
 #dtb_path = "/path/to/axvisor/configs/vms/arceos-aarch64-e2000_smp2.dtb"

configs/vms/arceos-aarch64-rk3568-smp1.toml

@@ -20,11 +20,11 @@ phys_cpu_ids = [0x200]
 entry_point = 0x7008_0000
 # The location of image: "memory" | "fs".
 # Load from memory.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x7008_0000
 ## The file path of the kernel image.
-kernel_path = "/path/arceos-aarch64-dyn.bin"
+kernel_path = "/userdata/rootfs_overlay/guest/arceos/roc-rk3568-pc"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x7000_0000
 #dtb_path = "/path/arceos-rk3568.dtb"

configs/vms/arceos-aarch64-rk3568-smp2.toml

@@ -20,11 +20,11 @@ phys_cpu_ids = [0x00, 0x100]
 entry_point = 0x7008_0000
 # The location of image: "memory" | "fs".
 # Load from memory.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x7008_0000
 ## The file path of the kernel image.
-kernel_path = "/path/arceos-aarch64-dyn.bin"
+kernel_path = "/userdata/rootfs_overlay/guest/arceos/roc-rk3568-pc"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x7000_0000
 #dtb_path = "/path/arceos-aarch64-rk3568_smp2.dtb"

configs/vms/linux-aarch64-e2000-smp1.toml

@@ -20,11 +20,11 @@ phys_cpu_ids = [0x100]
 entry_point = 0x20_4008_0000
 # The location of image: "memory" | "fs".
 # Load from file system.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x20_4008_0000
 ## The file path of the kernel image.
-kernel_path = "/path/to/Image"
+kernel_path = "/guest/linux/phytiumpi"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x20_4000_0000
 #dtb_path = "/path/to/axvisor/configs/vms/linux-aarch64-e2000_smp1.dtb"

configs/vms/linux-aarch64-e2000-smp2.toml

@@ -20,11 +20,11 @@ phys_cpu_ids = [0x200, 0x00]
 entry_point = 0x20_4008_0000
 # The location of image: "memory" | "fs".
 # Load from file system.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x20_4008_0000
 ## The file path of the kernel image.
-kernel_path = "/path/to/Image"
+kernel_path = "/guest/linux/phytiumpi"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x20_4000_0000
 #dtb_path = "/path/to/axvisor/configs/vms/linux-aarch64-e2000_smp2.dtb"

configs/vms/linux-aarch64-rk3568-smp1.toml

@@ -20,11 +20,11 @@ phys_cpu_ids = [0x00]
 entry_point = 0x8008_0000
 # The location of image: "memory" | "fs".
 # Load from memory.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x8008_0000
 ## The file path of the kernel image.
-kernel_path = "/path/Image"
+kernel_path = "/userdata/rootfs_overlay/guest/linux/roc-rk3568-pc"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x8000_0000
 #dtb_path = "/path/linux-aarch64-rk3568_smp1.dtb"

configs/vms/linux-aarch64-rk3568-smp2.toml

@@ -20,11 +20,11 @@ phys_cpu_ids = [0x200, 0x300]
 entry_point = 0x8008_0000
 # The location of image: "memory" | "fs".
 # Load from memory.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x8008_0000
 ## The file path of the kernel image.
-kernel_path = "/code/axvisor/rk3568-linux/Image"
+kernel_path = "/userdata/rootfs_overlay/guest/linux/roc-rk3568-pc"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x8000_0000
 #dtb_path = "/code/axvisor/configs/vms/linux-aarch64-rk3568_smp2.dtb"

configs/vms/rtthread-aarch64-e2000-smp1.toml

@@ -20,11 +20,11 @@ phys_cpu_ids = [0x100]
 entry_point = 0x8008_0000
 # The location of image: "memory" | "fs".
 # Load from file system.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x8008_0000
 ## The file path of the kernel image.
-kernel_path = "/home/zcs/WORKSPACE/axvisor/tmp/rtthread_a64.bin"
+kernel_path = "/guest/rtthread/phytiumpi"
 ## The file path of the device tree blob (DTB).
 # dtb_load_addr = 0x8000_0000
 #dtb_path = "/path/to/linux-aarch64-tac_e400-smp1.dtb"