[CI] don't extra clone repo in QEMU job

just use the one available in the workflow - copy it into image.

Author: lukaszstolarczuk

.github/workflows/qemu.yml

@@ -3,9 +3,6 @@ name: Qemu
 
 on: workflow_call
 
-env:
-  CI_BRANCH: "${{ github.head_ref || github.ref_name }}"
-
 permissions:
   contents: read
 
@@ -19,6 +16,7 @@ jobs:
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         fetch-depth: 0
+        path: umf
 
     - name: Enable KVM
       run: |
@@ -31,7 +29,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y qemu-system genisoimage qemu-utils \
           libvirt-clients libvirt-daemon-system libvirt-daemon virtinst bridge-utils
-        pip install -r scripts/qemu/requirements.txt
+        pip install -r umf/scripts/qemu/requirements.txt
 
     - name: Add user to kvm group
       run: sudo usermod -a -G kvm,libvirt $USER
@@ -82,33 +80,27 @@ jobs:
 
     - name: Build UMF in QEMU
       run: |
-        scripts/qemu/start_qemu.sh scripts/qemu/configs/default.xml
-
-        if [ ${{ github.event_name }} = 'pull_request' ]; then
-            CI_REPO="${{ github.event.pull_request.head.repo.full_name }}"
-        else
-            CI_REPO="$GITHUB_REPOSITORY"
-        fi
+        umf/scripts/qemu/start_qemu.sh default.xml
 
-        scp -P 2222 ${{github.workspace}}/scripts/qemu/run-build.sh [email protected]:/home/cxltest
-        scp -P 2222 ${{github.workspace}}/scripts/qemu/run-tests.sh [email protected]:/home/cxltest
+        rsync -az -e "ssh -p 2222" ${{github.workspace}}/umf/ [email protected]:/home/cxltest/
+        ssh [email protected] -p 2222 -t "sudo chown -R cxltest:users /home/cxltest"
 
-        ssh [email protected] -p 2222 -t "bash /home/cxltest/run-build.sh https://github.com/$CI_REPO ${{env.CI_BRANCH}}"
+        ssh [email protected] -p 2222 -t "bash /home/cxltest/scripts/qemu/run-build.sh"
         ssh [email protected] -p 2222 -t "sudo shutdown -h now"
 
     - name: Run tests in QEMU
       run: |
-        for config_file in scripts/qemu/configs/*.xml; do
-          config_name=$(basename $config_file .xml)
+        for config_file in umf/scripts/qemu/configs/*.xml; 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} ###"
-          scripts/qemu/start_qemu.sh $config_file
+          umf/scripts/qemu/start_qemu.sh ${config_name}
 
-          ssh [email protected] -p 2222 -t "bash /home/cxltest/run-tests.sh"
+          ssh [email protected] -p 2222 -t "bash /home/cxltest/scripts/qemu/run-tests.sh"
           ssh [email protected] -p 2222 -t "sudo shutdown -h now"
         done

scripts/qemu/run-build.sh

@@ -5,17 +5,10 @@
 
 set -e
 
-repo=$1
-branch=$2
-
 echo password | sudo -Sk apt-get update
 echo password | sudo -Sk apt-get install -y git cmake gcc g++ pkg-config \
     numactl libnuma-dev hwloc libhwloc-dev libjemalloc-dev libtbb-dev valgrind
 
-git clone $repo umf
-cd umf
-git checkout $branch
-
 mkdir build
 cd build
 

scripts/qemu/run-tests.sh

@@ -13,7 +13,7 @@ echo password | sudo bash -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope"
 
 numactl -H
 
-cd umf/build
+cd build
 ctest --verbose
 
 # run tests bound to a numa node

scripts/qemu/start_qemu.sh

@@ -5,10 +5,13 @@
 
 set -e
 
-config_file=$1
+# The config file name (should be located in ./configs/ sub-dir)
+config_name=$1
 
 # Parse the config file to get topology info and fix escaped single quotes
-parsed_config=$(python3 scripts/qemu/parse_config.py ${config_file} | sed s/''\''/'/g)
+parsed_config=$(python3 "$(dirname $0)/parse_config.py" "$(dirname $0)/configs/${config_name}" | sed s/''\''/'/g)
+
+set -x
 
 sudo qemu-system-x86_64 \
     -drive file=./ubuntu-23.04-server-cloudimg-amd64.img,format=qcow2,index=0,media=disk,id=hd \