-
Notifications
You must be signed in to change notification settings - Fork 242
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.
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
backends: add new test type virttools #3270
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Configuration files for some special variables in specific uri. | ||
variants: | ||
- qemu: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Copy this file to tests-shared.cfg and edit it. | ||
# | ||
# This file contains the base test set definitions, shared among single host | ||
# and multi host jobs. | ||
|
||
# Virtualization type (qemu or libvirt) | ||
vm_type = libvirt | ||
# The hypervisor uri (default, qemu://hostname/system, etc.) | ||
# where default or unset means derive from installed system | ||
connect_uri = default | ||
|
||
# Include the base config files. | ||
include base.cfg | ||
include subtests.cfg | ||
include host.cfg | ||
include machines.cfg | ||
include guest-os.cfg | ||
include guest-hw.cfg | ||
include cdkeys.cfg | ||
include virtio-win.cfg | ||
# Include special variable for specific driver. | ||
include drivers.cfg | ||
|
||
# Modify/comment the following lines if you wish to modify the paths of the | ||
# image files, ISO files or qemu binaries. | ||
# | ||
# As for the defaults: | ||
# * qemu and qemu-img are expected to be found under /usr/bin/qemu-kvm and | ||
# /usr/bin/qemu-img respectively. | ||
|
||
# Uncomment the following lines to enable abort-on-error mode: | ||
#abort_on_error = yes | ||
#kill_vm.* ?= no | ||
#kill_unresponsive_vms.* ?= no |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# File reserved for avocado-vt use, don't modify. | ||
include tests-shared.cfg | ||
|
||
variants: | ||
- @virttools_quick: | ||
start_vm = no | ||
virt_install_binary = /usr/bin/virt-install | ||
qemu_img_binary = /usr/bin/qemu-img | ||
hvm_or_pv = hvm | ||
use_os_variant = yes | ||
use_os_type = yes | ||
only qcow2 | ||
only virtio_net | ||
only virtio_blk | ||
only smp2 | ||
only no_9p_export | ||
only no_virtio_rng | ||
only no_pci_assignable | ||
only (image_backend=filesystem) | ||
only smallpages | ||
only default_bios | ||
only bridge | ||
|
||
|
||
|
||
only virttools_quick |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,3 +8,5 @@ subdir: libguestfs/ | |
subdir: lvsb/ | ||
[v2v] | ||
subdir: v2v/ | ||
[virttools] | ||
subdir: virttools/ |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we really need below filters when you enable virttools type?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chunfuwen In short, yes, I believe they are necessary, at least I prefer to keep them. I tried to run tests without them and I conclude it's better to keep them.
Details:
I believe they are not necessary functionally. However, I've found they have a big impact regarding performance. When I tried test case without these filters, they never started in a reasonable time while I found the cartesian config was still creating its test dictionaries in the background (can be seen in the crash log after ^C).
I assume the reason is that the number of variants explodes without these standard filters.
Please notice that many of these filters usually don't have an impact on the tp-libvirt test functions but are rather tp-qemu specific. I took these filters to be the same as the ones the tp-libvirt/libvirt test type uses, where they possibly aren't functionally necessary either. I'm not sure.
In any case, as mentioned before, without these filters I never got the test to start in a reasonable time, so I propose let's keep them. :)