Skip to content

Commit 67536b9

Browse files
committed
Update the case's epel repos for RHEL10 testing
Since from RHEL10. the cpuid package is excludes from epel_10.repo. So change the repo link to epel_9 for RHEL version >=10 Signed-off-by: Peixiu Hou <[email protected]>
1 parent 0874a20 commit 67536b9

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

qemu/tests/cfg/hv_avic.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
cpuid_chk_cmd = "rpm -qa | grep cpuid"
88
cpuid_pkg = "cpuid"
99
RHEL:
10-
repo_install_cmd = "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-%s.noarch.rpm"
10+
#set workaround from RHEL10.0 since no cpuid package includes in epel-10.repo
11+
repo_install_cmd = "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm"
1112
check_cpuid_entry_cmd = "cpuid -r -1 -l 0x40000004"

qemu/tests/cfg/hv_enforce_cpuid_msr_check.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
rdmsr_cmd = "rdmsr 0x40000002"
66
not_preprocess = yes
77
required_qemu = [6.2.0,)
8-
RHEL.9:
8+
RHEL:
99
repo_install_cmd = "yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm"
1010
RHEL.8:
1111
repo_install_cmd = "yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm"

qemu/tests/cfg/hv_flag_cpuid_check.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
cpuid_chk_cmd = "rpm -qa | grep cpuid"
77
cpuid_pkg = "cpuid"
88
RHEL:
9-
repo_install_cmd = "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-%s.noarch.rpm"
9+
#set workaround from RHEL10.0 since no cpuid package includes in epel-10.repo
10+
repo_install_cmd = "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm"
1011
variants:
1112
- hv_tlbflush_ext:
1213
hv_flag = "hv_tlbflush_ext"

qemu/tests/hv_avic.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ def install_epel_repo():
3434
repo_install_cmd = params.get("repo_install_cmd")
3535
if not repo_install_cmd:
3636
return
37-
rhel_major_ver = _get_rhel_major_ver()
38-
repo_install_cmd = repo_install_cmd % rhel_major_ver
37+
# set workaround from RHEL10.0 since no cpuid package includes in epel-10.repo
38+
# rhel_major_ver = _get_rhel_major_ver()
39+
# repo_install_cmd = repo_install_cmd % rhel_major_ver
3940
session.cmd_output_safe(repo_install_cmd)
4041
time.sleep(5)
4142

qemu/tests/hv_flag_cpuid_check.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ def install_epel_repo():
7171
repo_install_cmd = params.get("repo_install_cmd")
7272
if not repo_install_cmd:
7373
return
74-
rhel_major_ver = _get_rhel_major_ver()
75-
repo_install_cmd = repo_install_cmd % rhel_major_ver
74+
# set workaround from RHEL10.0 since no cpuid package includes in epel-10.repo
75+
# rhel_major_ver = _get_rhel_major_ver()
76+
# repo_install_cmd = repo_install_cmd % rhel_major_ver
7677
session.cmd_output_safe(repo_install_cmd)
7778
time.sleep(5)
7879

0 commit comments

Comments
 (0)