Skip to content

[master] quicktests: Force VDI format on creation#6999

Merged
psafont merged 2 commits into
xapi-project:masterfrom
last-genius:asv/master-quicktest-vhd-fix
Apr 15, 2026
Merged

[master] quicktests: Force VDI format on creation#6999
psafont merged 2 commits into
xapi-project:masterfrom
last-genius:asv/master-quicktest-vhd-fix

Conversation

@last-genius
Copy link
Copy Markdown
Contributor

@last-genius last-genius commented Apr 9, 2026

master version of #6998

cherry-picked commits 68c78d8, c3ac00b

@psafont
Copy link
Copy Markdown
Member

psafont commented Apr 9, 2026

Could you add the hashes of the cherry-picked commits, please?

@last-genius
Copy link
Copy Markdown
Contributor Author

Could you add the hashes of the cherry-picked commits, please?

Done

@psafont
Copy link
Copy Markdown
Member

psafont commented Apr 9, 2026

Could you add the hashes of the cherry-picked commits, please?

Done

I worded it incorrectly, sorry. I meant to add them in the commit messages, so they're easy to cross-check even without with this PR

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>
4194304 = 4MIB

Cherry-picked from 68c78d8

Signed-off-by: Andrii Sultanov <andriy.sultanov@vates.tech>
@last-genius last-genius force-pushed the asv/master-quicktest-vhd-fix branch from 23f76cd to 6960404 Compare April 9, 2026 10:30
@psafont psafont added this pull request to the merge queue Apr 15, 2026
Merged via the queue into xapi-project:master with commit ec8e405 Apr 15, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants