Skip to content

Update the case's epel repos for RHEL10 testing #4308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −7
Open

Update the case's epel repos for RHEL10 testing #4308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion qemu/tests/cfg/hv_avic.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
cpuid_chk_cmd = "rpm -qa | grep cpuid"
cpuid_pkg = "cpuid"
RHEL:
repo_install_cmd = "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-%s.noarch.rpm"
#set workaround from RHEL10.0 since no cpuid package includes in epel-10.repo
repo_install_cmd = "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@peixiu QEMU 6.2 is available for RHEL8, do you plan to remove the rhel8 support ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yanan-fu yes, our testing focus on the recent rhel9 and rhel10 version.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@peixiu This test case configuration does not have the limitation of exclude RHEL-8.

check_cpuid_entry_cmd = "cpuid -r -1 -l 0x40000004"
2 changes: 1 addition & 1 deletion qemu/tests/cfg/hv_enforce_cpuid_msr_check.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
rdmsr_cmd = "rdmsr 0x40000002"
not_preprocess = yes
required_qemu = [6.2.0,)
RHEL.9:
RHEL:
repo_install_cmd = "yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm"
RHEL.8:
repo_install_cmd = "yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm"
Expand Down
3 changes: 2 additions & 1 deletion qemu/tests/cfg/hv_flag_cpuid_check.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
cpuid_chk_cmd = "rpm -qa | grep cpuid"
cpuid_pkg = "cpuid"
RHEL:
repo_install_cmd = "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-%s.noarch.rpm"
#set workaround from RHEL10.0 since no cpuid package includes in epel-10.repo
repo_install_cmd = "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm"
variants:
- hv_tlbflush_ext:
hv_flag = "hv_tlbflush_ext"
Expand Down
5 changes: 3 additions & 2 deletions qemu/tests/hv_avic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ def install_epel_repo():
repo_install_cmd = params.get("repo_install_cmd")
if not repo_install_cmd:
return
rhel_major_ver = _get_rhel_major_ver()
repo_install_cmd = repo_install_cmd % rhel_major_ver
# set workaround from RHEL10.0 since no cpuid package includes in epel-10.repo
# rhel_major_ver = _get_rhel_major_ver()
# repo_install_cmd = repo_install_cmd % rhel_major_ver
session.cmd_output_safe(repo_install_cmd)
time.sleep(5)

Expand Down
5 changes: 3 additions & 2 deletions qemu/tests/hv_flag_cpuid_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ def install_epel_repo():
repo_install_cmd = params.get("repo_install_cmd")
if not repo_install_cmd:
return
rhel_major_ver = _get_rhel_major_ver()
repo_install_cmd = repo_install_cmd % rhel_major_ver
# set workaround from RHEL10.0 since no cpuid package includes in epel-10.repo
# rhel_major_ver = _get_rhel_major_ver()
# repo_install_cmd = repo_install_cmd % rhel_major_ver
session.cmd_output_safe(repo_install_cmd)
time.sleep(5)

Expand Down