CP-311612/CP-311613: make quicktests work if local storage is SMAPIv3#6908
Merged
edwintorok merged 2 commits intoxapi-project:masterfrom Mar 4, 2026
Merged
Conversation
This seems to be a SMAPIv1 specific implementation detail (content_id in VDI.other-config), that is missing on SMAPIv3 SRs. The rest of the test works on SMAPIv3, so skip just this step. Signed-off-by: Edwin Török <edwin.torok@citrix.com>
VHD export takes various shortcuts, and delta export only works if the source is also VHD.
Otherwise it fails with:
`Failure("Cannot compute differences on non-VHD images")`
If the source is already qcow2, like for SMAPIv3, then this is not (yet)
expected to work, so skip those tests on SMAPIv3 for now.
Note that regular export works, it is just the delta export that fails (specifying `base=`
in `xe vdi-export`).
Signed-off-by: Edwin Török <edwin.torok@citrix.com>
4307165 to
8ac4476
Compare
psafont
approved these changes
Feb 12, 2026
lindig
approved these changes
Feb 12, 2026
| Qt_filter.SR.(all |> allowed_operations [`vdi_create; `vdi_destroy] |> not_iso) | ||
|
|
||
| let supported_srs test_case = | ||
| let supported_srs ?(f = Fun.id) test_case = |
Contributor
There was a problem hiding this comment.
Is f the best name? Is this some filter or selector?
Member
|
Can this be backported to 26.1? |
Contributor
|
@edwintorok merge this? |
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 20, 2026
…M branch (#6959) Backport #6908 to the LCM branch. These latent bugs have existed in the tests for a long time, but previously our test system (XenRT) picked machines randomly, so it would've been unlikely to pick a machine which has a local 4K SR (SMAPIv3 instead of SMAPIv1), and even if it did, the test would seemingly pass on a rerun (because another machine would get picked). We are now explicitly running the test multiple times on different hardware categories, and some of those tests are now failing 100% of the time.
last-genius
added a commit
to last-genius/xen-api
that referenced
this pull request
Apr 9, 2026
Sort of a follow-up to xapi-project#6908, which filtered out SRs that only offer QCOW2 backing files. This commit allows running delta tests on SRs that offer both QCOW2 and VHD backing files (with QCOW2 as the default). Not specifying the format on SRs with default image format=qcow2 breaks delta tests for VHD (since they require two vhd images to calculate differences between). Force the format in VDI.create through sm-config instead. The sm-config parameter is ignored if it's not supported (i.e. on XenServer VHD-only SMAPIv1 SRs). Force format=vhd for max_vdi_size tests as well, since they're only exporting to vhd (and testing its max size), this speeds up the tests. Signed-off-by: Andrii Sultanov <andriy.sultanov@vates.tech>
last-genius
added a commit
to xcp-ng/xen-api
that referenced
this pull request
Apr 9, 2026
Sort of a follow-up to xapi-project#6908, which filtered out SRs that only offer QCOW2 backing files. This commit allows running delta tests on SRs that offer both QCOW2 and VHD backing files (with QCOW2 as the default). Not specifying the format on SRs with default image format=qcow2 breaks delta tests for VHD (since they require two vhd images to calculate differences between). Force the format in VDI.create through sm-config instead. The sm-config parameter is ignored if it's not supported (i.e. on XenServer VHD-only SMAPIv1 SRs). Force format=vhd for max_vdi_size tests as well, since they're only exporting to vhd (and testing its max size), this speeds up the tests. Signed-off-by: Andrii Sultanov <andriy.sultanov@vates.tech>
last-genius
added a commit
to last-genius/xen-api
that referenced
this pull request
Apr 9, 2026
Sort of a follow-up to xapi-project#6908, which filtered out SRs that only offer QCOW2 backing files. This commit allows running delta tests on SRs that offer both QCOW2 and VHD backing files (with QCOW2 as the default). Not specifying the format on SRs with default image format=qcow2 breaks delta tests for VHD (since they require two vhd images to calculate differences between). Force the format in VDI.create through sm-config instead. The sm-config parameter is ignored if it's not supported (i.e. on XenServer VHD-only SMAPIv1 SRs). Force format=vhd for max_vdi_size tests as well, since they're only exporting to vhd (and testing its max size), this speeds up the tests. Signed-off-by: Andrii Sultanov <andriy.sultanov@vates.tech>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Apr 9, 2026
Sort of a follow-up to #6908, which filtered out SRs that only offer QCOW2 backing files. This commit allows running delta tests on SRs that offer both QCOW2 and VHD backing files (with QCOW2 as the default). Not specifying the format on SRs with default image format=qcow2 breaks delta tests for VHD (since they require two vhd images to calculate differences between). Force the format in VDI.create through sm-config instead. The sm-config parameter is ignored if it's not supported (i.e. on XenServer VHD-only SMAPIv1 SRs). Force format=vhd for max_vdi_size tests as well, since they're only exporting to vhd (and testing its max size), this speeds up the tests.
last-genius
added a commit
to last-genius/xen-api
that referenced
this pull request
Apr 9, 2026
Sort of a follow-up to xapi-project#6908, which filtered out SRs that only offer QCOW2 backing files. This commit allows running delta tests on SRs that offer both QCOW2 and VHD backing files (with QCOW2 as the default). Not specifying the format on SRs with default image format=qcow2 breaks delta tests for VHD (since they require two vhd images to calculate differences between). Force the format in VDI.create through sm-config instead. The sm-config parameter is ignored if it's not supported (i.e. on XenServer VHD-only SMAPIv1 SRs). Force format=vhd for max_vdi_size tests as well, since they're only exporting to vhd (and testing its max size), this speeds up the tests. Cherry-picked from c3ac00b Signed-off-by: Andrii Sultanov <andriy.sultanov@vates.tech>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Want to run quicktest on wider range of hardware, and some of them have a SMAPIv3 local SR, which identified some bugs in the quicktest.
Before:
After: