.github/workflows/test.yml: Improve test workflow

.github/workflows/test.yml

@@ -3,14 +3,15 @@ name: Run DTS tests
 on:
   pull_request:
     branches:
-      - 'main'
+      - "main"
 jobs:
   build-dts:
     uses: ./.github/workflows/build.yml
     with:
       cacheless: false
-  run-tests:
-    name: Run DTS tests
+
+  prepare-for-tests:
+    name: Prepare for DTS tests
     if: ${{ github.head_ref == 'develop' && contains(join(needs.*.result, ','), 'success') }}
     needs: build-dts
     runs-on:
@@ -19,23 +20,13 @@ jobs:
       - name: Checkout OSFV repo
         uses: actions/checkout@v4
         with:
-          repository: 'Dasharo/open-source-firmware-validation'
-          path: 'open-source-firmware-validation'
-          submodules: 'recursive'
-          ref: 'develop'
+          repository: "Dasharo/open-source-firmware-validation"
+          path: "open-source-firmware-validation"
+          submodules: "recursive"
+          ref: "develop"
       - name: Run IPXE server
         shell: bash
-        run: |
-          mkdir ipxe
-          cp build/tmp/deploy/images/genericx86-64/dts-base-image-genericx86-64.cpio.gz ipxe
-          cp build/tmp/deploy/images/genericx86-64/bzImage ipxe
-          echo -e "\n
-          #!ipxe\n
-          imgfetch --name file_kernel bzImage\n
-          imgfetch --name file_initrd dts-base-image-genericx86-64.cpio.gz\n
-          kernel file_kernel root=/dev/nfs initrd=file_initrd\n
-          boot" > ipxe/dts.ipxe
-          cd ipxe && python3 -m http.server 4321 &
+        run: ./open-source-firmware-validation/scripts/ci/ipxe-run.sh
       - name: Install requirements
         shell: bash
         run: |
@@ -51,15 +42,48 @@ jobs:
           mkdir qemu-data
           touch qemu-data/hdd.qcow
           ./qemu-run.sh nographic os &
-      - name: Create directory for logs
-        shell: bash
-        id: log_dirs
-        run: |
-          timestamp=$(date -u +%Y-%m-%dT%H:%M:%S%Z)
-          directory="/tmp/dts-test-ci-${timestamp}"
-          mkdir $directory
-          echo "directory=$directory" >> "$GITHUB_OUTPUT"
-      - name: Run tests
+
+  run-tests:
+    name: Run DTS tests
+    if: ${{ github.head_ref == 'develop' && contains(join(needs.*.result, ','), 'success') }}
+    needs: build-dts
+    runs-on:
+      labels: dts-builder
+    strategy:
+      matrix:
+        include:
+          - test: msi
+            dpp_download_key: $MSI_DOWNLOAD
+            dpp_logs_key: $MSI_LOGS
+            log_file: output_msi.log
+
+          - test: msi_heads
+            dpp_download_key: $MSI_HEADS_DOWNLOAD
+            dpp_logs_key: $MSI_HEADS_LOGS
+            log_file: output_msi_heads.log
+
+          - test: optiplex
+            dpp_download_key: $OPTIPLEX_DOWNLOAD
+            dpp_logs_key: $OPTIPLEX_LOGS
+            log_file: output_nc_heads.log
+
+          - test: novacustom_heads
+            dpp_download_key: $OPTIPLEX_DOWNLOAD
+            dpp_logs_key: $OPTIPLEX_LOGS
+            log_file: output_nc_heads.log
+
+          - test: pcengines
+            dpp_download_key: $PCENGINES_DOWNLOAD
+            dpp_logs_key: $PCENGINES_LOGS
+            log_file: output_pcengines.log
+
+          - test: pcengines_seabios
+            dpp_download_key: $PCENGINES_SEABIOS_DOWNLOAD
+            dpp_logs_key: $PCENGINES_SEABIOS_LOGS
+            log_file: output_pcengines_seabios.log
+
+    steps:
+      - name: Run ${{ matrix.config.test }}
         shell: bash
         env:
           LOG_DIR: ${{ steps.log_dirs.outputs.directory }}
@@ -76,41 +100,13 @@ jobs:
           source ~/.secrets/dpp-keys
           ip_addr=$(ip -o -4 addr list eno2 | awk '{print $4}' | cut -d/ -f1)
 
-          robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \
-          -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$MSI_DOWNLOAD \
-          -v dpp_logs_key:$MSI_LOGS -v netboot_utilities_support:True \
-          -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \
-          -i "msi" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_msi.log | grep "| PASS |\|| FAIL |"
-
-          robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \
-          -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$MSI_HEADS_DOWNLOAD \
-          -v dpp_logs_key:$MSI_HEADS_LOGS -v netboot_utilities_support:True \
+          ./scripts/run.sh -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \
+          -v dpp_password:$DPP_PASSWORD -v dpp_download_key:${{ matrix.config.dpp_download_key }} \
+          -v dpp_logs_key:${{ matrix.config.dpp_logs_key }} -v netboot_utilities_support:True \
           -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \
-          -i "msi_heads" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_msi_heads.log | grep "| PASS |\|| FAIL |"
+          -i ${{ matrix.config.test }} dts/dts-e2e.robot 2>&1 \
+          | tee $LOG_DIR/${{ matrix.config.log_file }} | grep "| PASS |\|| FAIL |"
 
-          robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \
-          -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$OPTIPLEX_DOWNLOAD \
-          -v dpp_logs_key:$OPTIPLEX_LOGS -v netboot_utilities_support:True \
-          -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \
-          -i "optiplex" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_optiplex.log | grep "| PASS |\|| FAIL |"
-
-          robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \
-          -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$NOVACUSTOM_HEADS_DOWNLOAD \
-          -v dpp_logs_key:$NOVACUSTOM_HEADS_LOGS -v netboot_utilities_support:True \
-          -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \
-          -i "novacustom_heads" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_nc_heads.log | grep "| PASS |\|| FAIL |"
-
-          robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \
-          -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$PCENGINES_DOWNLOAD \
-          -v dpp_logs_key:$PCENGINES_LOGS -v netboot_utilities_support:True \
-          -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \
-          -i "pcengines" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_pcengines.log | grep "| PASS |\|| FAIL |"
-
-          robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \
-          -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$PCENGINES_SEABIOS_DOWNLOAD \
-          -v dpp_logs_key:$PCENGINES_SEABIOS_LOGS -v netboot_utilities_support:True \
-          -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \
-          -i "pcengines_seabios" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_pcengines_seabios.log | grep "| PASS |\|| FAIL |"
       - name: Copy log
         shell: bash
         env: