From cc53ba16a4c4e05ea37b9256f17007e8097984a1 Mon Sep 17 00:00:00 2001
From: Xiaofeng Wang <henrywangxf@me.com>
Date: Tue, 12 Aug 2025 18:19:13 +0800
Subject: [PATCH] test: Run script with sudo instead of adding sudo in script

Signed-off-by: Xiaofeng Wang <henrywangxf@me.com>
---
 .github/workflows/integration.yml | 13 ++++++++++++-
 tests/build.sh                    | 12 ++++++------
 tests/test.sh                     |  4 ++--
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 16ad9da1..07d47db2 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -24,7 +24,11 @@ jobs:
       - name: Build bootc and bootc image
         env:
           TEST_OS: ${{ matrix.test_os }}
-        run: tests/build.sh
+        run: sudo -E TEST_OS=$TEST_OS tests/build.sh
+
+      - name: Grant sudo user permission to archive files
+        run: |
+          sudo chmod 0755 /tmp/tmp-bootc-build/id_rsa
 
       - name: Archive bootc disk image - disk.raw
         uses: actions/upload-artifact@v4
@@ -73,6 +77,13 @@ jobs:
           name: PR-${{ github.event.number }}-${{ matrix.test_os }}-id_rsa
           path: /tmp/tmp-bootc-build
 
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls -l /dev/kvm
+
       - name: Run test
         env:
           TMT_PLAN_NAME: ${{ matrix.tmt_plan }}
diff --git a/tests/build.sh b/tests/build.sh
index 3c1c0d36..1b207ea0 100755
--- a/tests/build.sh
+++ b/tests/build.sh
@@ -82,7 +82,7 @@ EORUN
 CONTAINERFILEOF
 
 LOCAL_IMAGE="localhost/bootc:test"
-sudo podman build \
+podman build \
     --retry 5 \
     --retry-delay 5s \
     -v "$(pwd)":/code:z \
@@ -93,14 +93,14 @@ sudo podman build \
 SSH_KEY=${BOOTC_TEMPDIR}/id_rsa
 ssh-keygen -f "${SSH_KEY}" -N "" -q -t rsa-sha2-256 -b 2048
 
-sudo truncate -s 10G "${BOOTC_TEMPDIR}/disk.raw"
+truncate -s 10G "${BOOTC_TEMPDIR}/disk.raw"
 
 # For test-22-logically-bound-install
-sudo podman pull --retry 5 --retry-delay 5s quay.io/curl/curl:latest
-sudo podman pull --retry 5 --retry-delay 5s quay.io/curl/curl-base:latest
-sudo podman pull --retry 5 --retry-delay 5s registry.access.redhat.com/ubi9/podman:latest
+podman pull --retry 5 --retry-delay 5s quay.io/curl/curl:latest
+podman pull --retry 5 --retry-delay 5s quay.io/curl/curl-base:latest
+podman pull --retry 5 --retry-delay 5s registry.access.redhat.com/ubi9/podman:latest
 
-sudo podman run \
+podman run \
   --rm \
   --privileged \
   --pid=host \
diff --git a/tests/test.sh b/tests/test.sh
index 97b2df51..71fad8a4 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -10,7 +10,7 @@ SSH_KEY=${BOOTC_TEMPDIR}/id_rsa
 ARCH=$(uname -m)
 case "$ARCH" in
 "aarch64")
-  sudo qemu-system-aarch64 \
+  qemu-system-aarch64 \
     -name bootc-vm \
     -enable-kvm \
     -machine virt \
@@ -24,7 +24,7 @@ case "$ARCH" in
     -daemonize
   ;;
 "x86_64")
-  sudo qemu-system-x86_64 \
+  qemu-system-x86_64 \
     -name bootc-vm \
     -enable-kvm \
     -cpu host \