From ae4bf964784b3ebca8640f3111379ec740de2cfe Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Mon, 22 Feb 2021 17:26:45 +0800 Subject: [PATCH 1/3] add ini for tp-stratovirt Signed-off-by: Ke Zhiming --- test-providers.d/io-gitee-stratovirt.ini | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 test-providers.d/io-gitee-stratovirt.ini diff --git a/test-providers.d/io-gitee-stratovirt.ini b/test-providers.d/io-gitee-stratovirt.ini new file mode 100644 index 00000000..488b6952 --- /dev/null +++ b/test-providers.d/io-gitee-stratovirt.ini @@ -0,0 +1,5 @@ +[provider] +uri: https://gitee.com/EulerRobot/tp-stratovirt.git +[stratovirt] +subdir: stratovirt/ +configs: tests.cfg, tests-shared.cfg, stratovirt-base.cfg -- Gitee From 335c91763fd1b5fb0c20a9a50bacd12b5da1f729 Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Mon, 22 Feb 2021 17:28:37 +0800 Subject: [PATCH 2/3] add support for tp-stratovirt Signed-off-by: Ke Zhiming --- virttest/standalone_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virttest/standalone_test.py b/virttest/standalone_test.py index bfd3f22f..e0e6cd81 100644 --- a/virttest/standalone_test.py +++ b/virttest/standalone_test.py @@ -21,7 +21,7 @@ def _variant_only_file(filename): SUPPORTED_TEST_TYPES = [ - 'qemu', 'libvirt', 'libguestfs', 'openvswitch', 'v2v', 'lvsb', 'spice'] + 'qemu', 'libvirt', 'libguestfs', 'openvswitch', 'v2v', 'lvsb', 'spice', 'stratovirt'] SUPPORTED_LIBVIRT_URIS = ['qemu:///system', 'lxc:///'] SUPPORTED_LIBVIRT_DRIVERS = ['qemu', 'lxc', 'xen'] -- Gitee From e6b56825752f028824ac5eb672190d9b964c207a Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Mon, 22 Feb 2021 17:29:35 +0800 Subject: [PATCH 3/3] bootstrap support tp-stratovirt Signed-off-by: Ke Zhiming --- virttest/bootstrap.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/virttest/bootstrap.py b/virttest/bootstrap.py index 7406f750..f31cae11 100644 --- a/virttest/bootstrap.py +++ b/virttest/bootstrap.py @@ -35,7 +35,8 @@ recommended_programs = {'qemu': [('qemu-kvm', 'kvm'), ('qemu-img',), 'openvswitch': [], 'lvsb': [('semanage',), ('getfattr',), ('restorecon',), ('virt-sandbox')], 'v2v': [], - 'libguestfs': [('perl',)]} + 'libguestfs': [('perl',)], + 'stratovirt': []} mandatory_programs = {'qemu': basic_program_requirements + ['gcc'], 'spice': basic_program_requirements + ['gcc'], @@ -43,7 +44,8 @@ mandatory_programs = {'qemu': basic_program_requirements + ['gcc'], 'openvswitch': basic_program_requirements, 'lvsb': ['virt-sandbox', 'virt-sandbox-service', 'virsh'], 'v2v': basic_program_requirements, - 'libguestfs': basic_program_requirements} + 'libguestfs': basic_program_requirements, + 'stratovirt': basic_program_requirements} mandatory_headers = {'qemu': ['Python.h', 'types.h', 'socket.h', 'unistd.h'], 'spice': [], @@ -51,7 +53,8 @@ mandatory_headers = {'qemu': ['Python.h', 'types.h', 'socket.h', 'unistd.h'], 'openvswitch': [], 'v2v': [], 'lvsb': [], - 'libguestfs': []} + 'libguestfs': [], + 'stratovirt': []} first_subtest = {'qemu': ['unattended_install', 'steps'], 'spice': ['unattended_install', 'steps'], @@ -59,7 +62,8 @@ first_subtest = {'qemu': ['unattended_install', 'steps'], 'openvswitch': ['unattended_install'], 'v2v': ['unattended_install'], 'libguestfs': ['unattended_install'], - 'lvsb': []} + 'lvsb': [], + 'stratovirt': []} last_subtest = {'qemu': ['shutdown'], 'spice': ['shutdown'], @@ -67,7 +71,8 @@ last_subtest = {'qemu': ['shutdown'], 'openvswitch': ['shutdown'], 'v2v': ['shutdown'], 'libguestfs': ['shutdown'], - 'lvsb': []} + 'lvsb': [], + 'stratovirt': []} test_filter = ['__init__', 'cfg', 'dropin.py'] @@ -406,7 +411,7 @@ def create_subtests_cfg(t_type): provider_info_shared.append( asset.get_test_provider_info(shared_provider)) - if not t_type == 'lvsb': + if not t_type == 'lvsb' and not t_type == 'stratovirt': for subdir in shared_subdirs: shared_test_list += data_dir.SubdirGlobList(subdir, '*.py', -- Gitee