From 3c3a339542b4e8eb5e18f360f47b2c805e8d9050 Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Thu, 10 Dec 2020 14:05:08 +0800 Subject: [PATCH 1/2] virttest: images's file system configure The partition where the images is stored configures the disk file system, including the temporary image partiton Signed-off-by: Ke Zhiming --- tests/virttest | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/virttest b/tests/virttest index 65556ed..35e5fa3 100755 --- a/tests/virttest +++ b/tests/virttest @@ -292,7 +292,12 @@ ok=0 all=0 # image file system config -mount /dev/sdb ${images_path} || echo y | mkfs.ext4 /dev/sdb && mount /dev/sdb ${images_path} +if [ $os_mount == "cifs" -o $os_mount == "nfs" -o $os_mount == "initramfs" ]; then + mount /dev/sdb ${images_path} || echo y | mkfs.ext4 /dev/sdb && mount /dev/sdb ${images_path} + rm -rf ${images_path:?}/tmp + mkdir -p ${images_path}/tmp + mount --bind ${images_path}/tmp /var/tmp +fi # download images images_download -- Gitee From 64a9ef1a555687f039f4996f8003c2fe8f85d720 Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Thu, 10 Dec 2020 14:07:03 +0800 Subject: [PATCH 2/2] jobyaml: testcase decomposition The testcase of virsh.attach_device is too large and needs to be decomposed into multiple sub testcase Signed-off-by: Ke Zhiming --- jobs/virttest_st.yaml | 58 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/jobs/virttest_st.yaml b/jobs/virttest_st.yaml index a71b4ac..71334a7 100644 --- a/jobs/virttest_st.yaml +++ b/jobs/virttest_st.yaml @@ -413,9 +413,63 @@ virttest-70: vt_type: libvirt vt_no_filter: kvmclock,hpet -virttest-71: +virttest-71-1: vt_reference: - - virsh.attach_device + - virsh.attach_device.block.multi_virtio_file + vt_type: libvirt + no_filter: hot_attach_hot_vm.*block.*virtio_file + +virttest-71-2: + vt_reference: + - virsh.attach_device.block.sigle_file + vt_type: libvirt + no_filter: hot_attach_hot_vm.*block.*virtio_file + +virttest-71-3: + vt_reference: + - virsh.attach_device.block.single_scsi_file + vt_type: libvirt + no_filter: hot_attach_hot_vm.*block.*virtio_file + +virttest-71-4: + vt_reference: + - virsh.attach_device.single_usb_file + vt_type: libvirt + no_filter: hot_attach_hot_vm.*block.*virtio_file + +virttest-71-5: + vt_reference: + - virsh.attach_device.single_virtio_file + vt_type: libvirt + no_filter: hot_attach_hot_vm.*block.*virtio_file + +virttest-71-6: + vt_reference: + - virsh.attach_device.character.channel + vt_type: libvirt + no_filter: hot_attach_hot_vm.*block.*virtio_file + +virttest-71-7: + vt_reference: + - virsh.attach_device.character.console + vt_type: libvirt + no_filter: hot_attach_hot_vm.*block.*virtio_file + +virttest-71-8: + vt_reference: + - virsh.attach_device.character.serial + vt_type: libvirt + no_filter: hot_attach_hot_vm.*block.*virtio_file + +virttest-71-9: + vt_reference: + - virsh.attach_device.controller.type_scsi + vt_type: libvirt + no_filter: hot_attach_hot_vm.*block.*virtio_file + +virttest-71-10: + vt_reference: + - virsh.attach_device.multiple vt_type: libvirt no_filter: hot_attach_hot_vm.*block.*virtio_file -- Gitee