Skip to content

Commit 20ad66d

Browse files
committed
CI speed up vm_snapshot_attach_disk module test
Signed-off-by: Justin Cinkelj <[email protected]>
1 parent 35617ad commit 20ad66d

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

tests/integration/targets/vm_snapshot/tasks/03_vm_snapshot_attach_disk.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
slot_b: 0 # vm_2, ide_disk
1414

1515
force_reboot: true # allow forced vm shutdown
16+
shutdown_timeout: 10
1617

1718
# disk size gets rounded by HC3:
1819
# 0.1 GB to 107374182 B
@@ -83,6 +84,7 @@
8384
source_disk_type: virtio_disk
8485
source_disk_slot: 1
8586
force_reboot: "{{ force_reboot }}"
87+
shutdown_timeout: "{{ shutdown_timeout }}"
8688
register: result
8789
- ansible.builtin.debug:
8890
var: result
@@ -128,6 +130,7 @@
128130
source_disk_type: virtio_disk
129131
source_disk_slot: 1
130132
force_reboot: "{{ force_reboot }}"
133+
shutdown_timeout: "{{ shutdown_timeout }}"
131134
register: result
132135
- ansible.builtin.debug:
133136
var: result
@@ -157,7 +160,7 @@
157160
source_disk_type: virtio_disk
158161
source_disk_slot: 1
159162
force_reboot: "{{ force_reboot }}"
160-
shutdown_timeout: 10 # For faster testing. VM has no OS, so it cannot react to ACPI shutdown.
163+
shutdown_timeout: "{{ shutdown_timeout }}" # For faster testing. VM has no OS, so it cannot react to ACPI shutdown.
161164
register: result
162165
- ansible.builtin.debug:
163166
var: result
@@ -201,6 +204,7 @@
201204
source_disk_type: virtio_disk
202205
source_disk_slot: 1
203206
force_reboot: "{{ force_reboot }}"
207+
shutdown_timeout: "{{ shutdown_timeout }}"
204208
register: result
205209
- ansible.builtin.debug:
206210
var: result
@@ -231,6 +235,7 @@
231235
source_disk_type: virtio_disk
232236
source_disk_slot: 1
233237
force_reboot: "{{ force_reboot }}"
238+
shutdown_timeout: "{{ shutdown_timeout }}"
234239
register: result
235240
- ansible.builtin.debug:
236241
var: result
@@ -270,6 +275,7 @@
270275
source_disk_type: virtio_disk
271276
source_disk_slot: 1
272277
force_reboot: "{{ force_reboot }}"
278+
shutdown_timeout: "{{ shutdown_timeout }}"
273279
register: result
274280
- ansible.builtin.debug:
275281
var: result

tests/integration/targets/vm_snapshot/tasks/main.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
# greater than 0, is a newer snapshot
1515

1616
block:
17+
- name: Delete VMs before test
18+
include_tasks: helper_api_vm_snapshot_delete_all.yml
19+
vars:
20+
vms_number: "{{ number_of_snapshot_testing_vms }}"
21+
1722
- name: Create VMs
1823
include_tasks: helper_api_vm_snapshot_create.yml
1924
vars:
@@ -31,6 +36,7 @@
3136
vars:
3237
test_vms_number: "{{ number_of_snapshot_testing_vms }}"
3338
always:
34-
- include_tasks: helper_api_vm_snapshot_delete_all.yml
39+
- name: Delete VMs after test
40+
include_tasks: helper_api_vm_snapshot_delete_all.yml
3541
vars:
3642
vms_number: "{{ number_of_snapshot_testing_vms }}"

0 commit comments

Comments
 (0)