[CI] Enable short run of QEMU in PR/push workflow

Run full QEMU suite in nightly workflow only.
Enable more Ubuntu OSes along.

Author: lukaszstolarczuk

.github/workflows/nightly.yml

@@ -185,4 +185,11 @@ jobs:
     uses: ./.github/workflows/reusable_gpu.yml
     with:
       name: "CUDA"
-      os: "['Ubuntu']"
+      os: "['Ubuntu']"
+
+  # Full exeuction of QEMU tests
+  QEMU:
+    uses: ./.github/workflows/reusable_qemu.yml
+    with:
+      short_run: false
+      os: "['ubuntu-23.04', 'ubuntu-24.04']"

.github/workflows/pr_push.yml

@@ -49,9 +49,11 @@ jobs:
   Sanitizers:
     needs: [FastBuild]
     uses: ./.github/workflows/reusable_sanitizers.yml
-  Qemu:
+  QEMU:
     needs: [FastBuild]
     uses: ./.github/workflows/reusable_qemu.yml
+    with:
+      short_run: true
   Benchmarks:
     needs: [Build]
     uses: ./.github/workflows/reusable_benchmarks.yml
@@ -64,15 +66,15 @@ jobs:
   Coverage:
     # total coverage (on upstream only)
     if: github.repository == 'oneapi-src/unified-memory-framework'
-    needs: [Build, DevDax, L0, CUDA, MultiNuma, Qemu, ProxyLib]
+    needs: [Build, DevDax, L0, CUDA, MultiNuma, QEMU, ProxyLib]
     uses: ./.github/workflows/reusable_coverage.yml
     secrets: inherit
     with:
       trigger: "${{github.event_name}}"
   Coverage_partial:
     # partial coverage (on forks)
     if: github.repository != 'oneapi-src/unified-memory-framework'
-    needs: [Build, Qemu, ProxyLib]
+    needs: [Build, QEMU, ProxyLib]
     uses: ./.github/workflows/reusable_coverage.yml
   CodeQL:
     needs: [Build]

.github/workflows/reusable_qemu.yml

@@ -1,14 +1,29 @@
 # Builds project on qemu with custom hmat settings
 name: Qemu
 
-on: workflow_call
+on:
+  workflow_call:
+    inputs:
+      short_run:
+        description: Should the workflow run only basic tests?
+        type: boolean
+        default: false
+      os:
+        description: List of OSes
+        type: string
+        default: '["ubuntu-23.04"]'
 
 permissions:
   contents: read
 
 jobs:
   qemu-build:
-    name: Qemu
+    name: QEMU
+    strategy:
+      matrix:
+        os: ${{ fromJson(inputs.os) }}
+
+    # Host QEMU on any Linux platform
     runs-on: ubuntu-22.04
 
     steps:
@@ -79,11 +94,26 @@ jobs:
 
         sudo -Sk genisoimage -output ubuntu-cloud-init.iso -volid cidata -joliet -rock ./user-data ./meta-data
 
-    - name: Download ubuntu image
-      run: wget https://cloud-images.ubuntu.com/releases/lunar/release/ubuntu-23.04-server-cloudimg-amd64.img
+    - name: Set vars if short run
+      if: ${{ inputs.short_run == true }}
+      run: |
+        echo "SHORT_RUN=true" >> $GITHUB_ENV
+        declare -a short_configs=("default.xml" "sock_2_var3.xml" "sock_4_var1_hmat.xml")
+        echo "CONFIG_OPTIONS=${short_configs[@]}" >> $GITHUB_ENV
+
+    - name: Set vars if long run
+      if: ${{ inputs.short_run == false }}
+      run: |
+        echo "SHORT_RUN=false" >> $GITHUB_ENV
+        echo "CONFIG_OPTIONS=umf/scripts/qemu/configs/*.xml" >> $GITHUB_ENV
+
+    - name: Download Ubuntu image
+      run: |
+        OS_VER=$(echo ${{matrix.os}} | cut -d'-' -f2)
+        wget https://cloud-images.ubuntu.com/releases/${OS_VER}/release/${{matrix.os}}-server-cloudimg-amd64.img -O qemu_image.img
 
     - name: Resize image
-      run: qemu-img resize ./ubuntu-23.04-server-cloudimg-amd64.img +4G
+      run: qemu-img resize ./qemu_image.img +4G
 
     - name: Build UMF in QEMU
       run: |
@@ -98,24 +128,26 @@ jobs:
 
     - name: Run tests in QEMU
       run: |
-        for config_file in umf/scripts/qemu/configs/*.xml; do
+        echo "Running tests for: ${CONFIG_OPTIONS}"
+
+        for config_file in ${CONFIG_OPTIONS}; do
           config_name=$(basename $config_file)
 
           while ps -aux | grep qemu-system-x86_64 | grep -q -v grep; do
             echo "Waiting for QEMU to shut down..."
             sleep 5
           done
 
-          echo "\n ### Testing ${config_name} ###"
+          echo "### Testing ${config_name} ###"
           umf/scripts/qemu/start_qemu.sh ${config_name}
 
-          ssh testuser@127.0.0.1 -p 2222 -t "bash /home/testuser/scripts/qemu/run-tests.sh COVERAGE ${config_name}"
+          ssh testuser@127.0.0.1 -p 2222 -t "export SHORT_RUN=${SHORT_RUN} OS_FULL_NAME=${{matrix.os}} && /home/testuser/scripts/qemu/run-tests.sh COVERAGE ${config_name}"
           scp -r -P 2222 testuser@127.0.0.1:/home/testuser/coverage ./
           ssh testuser@127.0.0.1 -p 2222 -t "sudo shutdown -h now"
         done
         ls -al ./coverage
 
     - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       with:
-        name: exports-coverage-qemu-all
+        name: exports-coverage-qemu-${{matrix.os}}
         path: coverage

scripts/qemu/run-tests.sh

@@ -3,6 +3,9 @@
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+# If env var SHORT_RUN is set to true, part of the tests are skipped here.
+# For coverage, OS_FULL_NAME env variable has to be set to the name of the OS.
+
 set -e
 
 COVERAGE=$1
@@ -26,19 +29,22 @@ echo password | sudo bash -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope"
 numactl -H
 
 cd build
+echo "## Running all tests ..."
 ctest --verbose
 
-# run tests bound to a numa node
+echo "## Running tests bound to a numa node 0 and node 1 ..."
 numactl -N 0 ctest --output-on-failure
 numactl -N 1 ctest --output-on-failure
 
 if [ "$COVERAGE" = "COVERAGE" ]; then
-	COVERAGE_FILE_NAME=exports-coverage-qemu-$CONFIG_NAME
+	COVERAGE_FILE_NAME=exports-coverage-qemu-${OS_FULL_NAME}-${CONFIG_NAME}
 	echo "COVERAGE_FILE_NAME: $COVERAGE_FILE_NAME"
 	../scripts/coverage/coverage_capture.sh $COVERAGE_FILE_NAME
 	mv ./$COVERAGE_FILE_NAME $COVERAGE_DIR
 fi
 
-# run tests under valgrind
-echo "Running tests under valgrind memcheck ..."
-../test/test_valgrind.sh .. . memcheck
+# run tests under valgrind only on long run or for default configuration
+if [ "${SHORT_RUN}" != "true" ] || [ "${CONFIG_NAME}" == "default" ]; then
+	echo "## Running tests under valgrind memcheck ..."
+	../test/test_valgrind.sh .. . memcheck
+fi

scripts/qemu/start_qemu.sh

@@ -14,7 +14,7 @@ parsed_config=$(python3 "$(dirname $0)/parse_config.py" "$(dirname $0)/configs/$
 set -x
 
 sudo qemu-system-x86_64 \
-    -drive file=./ubuntu-23.04-server-cloudimg-amd64.img,format=qcow2,index=0,media=disk,id=hd \
+    -drive file=./qemu_image.img,format=qcow2,index=0,media=disk,id=hd \
     -cdrom ./ubuntu-cloud-init.iso \
     -enable-kvm \
     -net nic -net user,hostfwd=tcp::2222-:22 \