[ACT][PATCH 1/1] UBUNTU: SAUCE: ubuntu_kvm_unit_tests: fix test build issue with new branch and improve test granularity

Po-Hsu Lin po-hsu.lin at canonical.com
Thu Aug 19 15:14:50 UTC 2021


BugLink: https://bugs.launchpad.net/bugs/1900646
         https://bugs.launchpad.net/bugs/1938875

Use the hirsute branch [1] for our SRU, it's a rebase with our local
SAUCE patches from the old disco branch on top of the latest tip of
the kvm-unit-tests repo upstream.

This branch can fix the test build issue on newer releases (bug
1900646).

Also, it contains a patch to pull failed vmx tests out (bug
1938875):
  * vmx_guest_state_area_test
  * vmx_cr4_osxsave_test
  * vmx_preemption_timer_expiry_test
  * vmx_preemption_timer_tf_test
  * vmx_preemption_timer_zero_test
  * rdtsc_vmexit_diff_test
  * vmx_mtf_test
  * vmx_mtf_pdpte_test
  * vmx_db_test
  * vmx_apic_passthrough_test
  * virt_x2apic_mode_test

As the vmx test contains over 40k sub-tests, pulling failed test
cases out can improve our test granularity, make it easier to narrow
down the real issue, make result hinting more precise and allow this
vmx test to have a chance finish properly.

Note that the "instruction intercept" failure in vmx (bug 1931956) on
kvm instances was not touched, it seems this test cannot be moved out
of vmx easily.

[1] https://kernel.ubuntu.com/git/ubuntu/kvm-unit-tests/log/?h=hirsute

Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
---
 ubuntu_kvm_unit_tests/ubuntu_kvm_unit_tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ubuntu_kvm_unit_tests/ubuntu_kvm_unit_tests.py b/ubuntu_kvm_unit_tests/ubuntu_kvm_unit_tests.py
index 94b237aa..9c9f843e 100644
--- a/ubuntu_kvm_unit_tests/ubuntu_kvm_unit_tests.py
+++ b/ubuntu_kvm_unit_tests/ubuntu_kvm_unit_tests.py
@@ -46,7 +46,7 @@ class ubuntu_kvm_unit_tests(test.test):
         opt = []
         os.chdir(self.srcdir)
         shutil.rmtree('kvm-unit-tests', ignore_errors=True)
-        cmd = 'git clone --depth=1 git://kernel.ubuntu.com/ubuntu/kvm-unit-tests/ -b disco'
+        cmd = 'git clone --depth=1 git://kernel.ubuntu.com/ubuntu/kvm-unit-tests/ -b hirsute'
         self.results = utils.system_output(cmd, retain_output=True)
         # Print test suite HEAD SHA1 commit id for future reference
         os.chdir(os.path.join(self.srcdir, 'kvm-unit-tests'))
-- 
2.25.1




More information about the kernel-team mailing list