From 1ce6d161fefab5cd4f7c0c4e74bd5657c68dd43c Mon Sep 17 00:00:00 2001 From: Justin Cinkelj Date: Fri, 17 Jan 2025 16:57:08 +0100 Subject: [PATCH] CI avoid testing virtual disk with empty disk image - continued Signed-off-by: Justin Cinkelj --- .../targets/virtual_disk/tasks/02_not_supported.yml | 7 ++++++- .../targets/virtual_disk_attach/tasks/01_supported.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/integration/targets/virtual_disk/tasks/02_not_supported.yml b/tests/integration/targets/virtual_disk/tasks/02_not_supported.yml index 3cb7e5d47..ee8212b11 100644 --- a/tests/integration/targets/virtual_disk/tasks/02_not_supported.yml +++ b/tests/integration/targets/virtual_disk/tasks/02_not_supported.yml @@ -1,7 +1,12 @@ --- - name: Generate virtual disk file qcow2 ansible.builtin.shell: - cmd: qemu-img create -f qcow2 xlab-ci-test-VD.qcow2 10M + cmd: | + qemu-img create -f raw xlab-ci-test-VD.raw 10M + # HC3 has some problems with very small/empty disk images. + # Run mkfs to populate image. + mkfs.ext4 xlab-ci-test-VD.raw + qemu-img convert -c -O qcow2 xlab-ci-test-VD.raw xlab-ci-test-VD.qcow2 register: generated_img - name: Create virtual disk, must fail diff --git a/tests/integration/targets/virtual_disk_attach/tasks/01_supported.yml b/tests/integration/targets/virtual_disk_attach/tasks/01_supported.yml index d3e7d87f0..6de669069 100644 --- a/tests/integration/targets/virtual_disk_attach/tasks/01_supported.yml +++ b/tests/integration/targets/virtual_disk_attach/tasks/01_supported.yml @@ -20,7 +20,12 @@ - name: Generate virtual disk file qcow2 ansible.builtin.shell: - cmd: qemu-img create -f qcow2 xlab-ci-test-VD-attach.qcow2 10M + cmd: | + qemu-img create -f raw xlab-ci-test-VD-attach.raw 10M + # HC3 has some problems with very small/empty disk images. + # Run mkfs to populate image. + mkfs.ext4 xlab-ci-test-VD-attach.raw + qemu-img convert -c -O qcow2 xlab-ci-test-VD-attach.raw xlab-ci-test-VD-attach.qcow2 - name: Upload xlab-ci-test-VD-attach.qcow2 scale_computing.hypercore.virtual_disk: