From f2a6a2b230726b89492a0d7eb723764bc2c79bb0 Mon Sep 17 00:00:00 2001 From: japokorn Date: Mon, 4 Oct 2021 21:18:20 +0200 Subject: [PATCH] Added skip checks feature to speed up the tests (#218) * Added skip checks feature to speed up the tests - added new fact that allows to skip some checks in case the role is run multiple times within the same playbook - this should help speed up the tests * Added skip checks feature to speed up the tests - removed "packages_installed", now it is part of "required_packages" check - pylint fixes - luks tests install extra packages and checks skipping causes race condition - checks do not disabled in this case (commit will be squashed into previous one) --- tasks/main-blivet.yml | 10 ++++++++++ tests/tests_change_disk_fs.yml | 7 +++++++ tests/tests_change_disk_mount.yml | 7 +++++++ tests/tests_change_fs.yml | 7 +++++++ tests/tests_change_fs_use_partitions.yml | 7 +++++++ tests/tests_change_mount.yml | 7 +++++++ tests/tests_create_disk_then_remove.yml | 7 +++++++ tests/tests_create_lv_size_equal_to_vg.yml | 7 +++++++ tests/tests_create_lvm_pool_then_remove.yml | 7 +++++++ tests/tests_create_lvmvdo_then_remove.yml | 7 +++++++ tests/tests_create_partition_volume_then_remove.yml | 7 +++++++ tests/tests_create_raid_pool_then_remove.yml | 7 +++++++ tests/tests_create_raid_volume_then_remove.yml | 7 +++++++ tests/tests_disk_errors.yml | 7 +++++++ tests/tests_existing_lvm_pool.yml | 7 +++++++ tests/tests_fatals_raid_pool.yml | 7 +++++++ tests/tests_fatals_raid_volume.yml | 7 +++++++ tests/tests_filesystem_one_disk.yml | 7 +++++++ tests/tests_luks_pool.yml | 13 +++++++++++++ tests/tests_lvm_auto_size_cap.yml | 7 +++++++ tests/tests_lvm_errors.yml | 7 +++++++ tests/tests_lvm_multiple_disks_multiple_volumes.yml | 7 +++++++ tests/tests_lvm_one_disk_multiple_volumes.yml | 7 +++++++ tests/tests_lvm_one_disk_one_volume.yml | 7 +++++++ tests/tests_misc.yml | 7 +++++++ tests/tests_missing_volume_type_in_pool.yml | 7 +++++++ tests/tests_null_raid_pool.yml | 7 +++++++ tests/tests_raid_pool_options.yml | 7 +++++++ tests/tests_raid_volume_options.yml | 7 +++++++ tests/tests_remove_mount.yml | 7 +++++++ tests/tests_remove_nonexistent_pool.yml | 7 +++++++ tests/tests_resize.yml | 7 +++++++ tests/tests_swap.yml | 7 +++++++ tests/tests_volume_relabel.yml | 7 +++++++ 34 files changed, 247 insertions(+) diff --git a/tasks/main-blivet.yml b/tasks/main-blivet.yml index cc49d1ff..822c9b7f 100644 --- a/tasks/main-blivet.yml +++ b/tasks/main-blivet.yml @@ -8,6 +8,8 @@ package: name: "{{ blivet_package_list }}" state: present + when: storage_skip_checks is not defined or + not "blivet_available" in storage_skip_checks - debug: var: storage_pools @@ -25,19 +27,27 @@ volume_defaults: "{{ storage_volume_defaults }}" packages_only: true register: package_info + when: storage_skip_checks is not defined or + not "packages_installed" in storage_skip_checks - name: enable copr repositories if needed include_tasks: "enable_coprs.yml" vars: copr_packages: "{{ package_info.packages }}" + when: storage_skip_checks is not defined or + not "packages_installed" in storage_skip_checks - name: make sure required packages are installed package: name: "{{ package_info.packages }}" state: present + when: storage_skip_checks is not defined or + not "packages_installed" in storage_skip_checks - name: get service facts service_facts: + when: storage_skip_checks is not defined or + not "service_facts" in storage_skip_checks - name: Set storage_cryptsetup_services set_fact: diff --git a/tests/tests_change_disk_fs.yml b/tests/tests_change_disk_fs.yml index 5670f4df..e490d878 100644 --- a/tests/tests_change_disk_fs.yml +++ b/tests/tests_change_disk_fs.yml @@ -11,6 +11,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_size }}" diff --git a/tests/tests_change_disk_mount.yml b/tests/tests_change_disk_mount.yml index fa4eff4c..8f6314d9 100644 --- a/tests/tests_change_disk_mount.yml +++ b/tests/tests_change_disk_mount.yml @@ -10,6 +10,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_size }}" diff --git a/tests/tests_change_fs.yml b/tests/tests_change_fs.yml index 236891c5..936e5e09 100644 --- a/tests/tests_change_fs.yml +++ b/tests/tests_change_fs.yml @@ -11,6 +11,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_size }}" diff --git a/tests/tests_change_fs_use_partitions.yml b/tests/tests_change_fs_use_partitions.yml index 037c79a1..6ecdaf65 100644 --- a/tests/tests_change_fs_use_partitions.yml +++ b/tests/tests_change_fs_use_partitions.yml @@ -12,6 +12,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_size }}" diff --git a/tests/tests_change_mount.yml b/tests/tests_change_mount.yml index 96b8dd53..2e1842fa 100644 --- a/tests/tests_change_mount.yml +++ b/tests/tests_change_mount.yml @@ -10,6 +10,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_size }}" diff --git a/tests/tests_create_disk_then_remove.yml b/tests/tests_create_disk_then_remove.yml index d69d6217..20214529 100644 --- a/tests/tests_create_disk_then_remove.yml +++ b/tests/tests_create_disk_then_remove.yml @@ -9,6 +9,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 1 diff --git a/tests/tests_create_lv_size_equal_to_vg.yml b/tests/tests_create_lv_size_equal_to_vg.yml index 1737036d..77890522 100644 --- a/tests/tests_create_lv_size_equal_to_vg.yml +++ b/tests/tests_create_lv_size_equal_to_vg.yml @@ -14,6 +14,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_group_size }}" diff --git a/tests/tests_create_lvm_pool_then_remove.yml b/tests/tests_create_lvm_pool_then_remove.yml index 4bdb1ebd..51945c74 100644 --- a/tests/tests_create_lvm_pool_then_remove.yml +++ b/tests/tests_create_lvm_pool_then_remove.yml @@ -13,6 +13,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_group_size }}" diff --git a/tests/tests_create_lvmvdo_then_remove.yml b/tests/tests_create_lvmvdo_then_remove.yml index d959bb52..eaff3ef5 100644 --- a/tests/tests_create_lvmvdo_then_remove.yml +++ b/tests/tests_create_lvmvdo_then_remove.yml @@ -12,6 +12,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - name: Gather package facts package_facts: # gather information about packages diff --git a/tests/tests_create_partition_volume_then_remove.yml b/tests/tests_create_partition_volume_then_remove.yml index 648750a1..935fa479 100644 --- a/tests/tests_create_partition_volume_then_remove.yml +++ b/tests/tests_create_partition_volume_then_remove.yml @@ -9,6 +9,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 1 diff --git a/tests/tests_create_raid_pool_then_remove.yml b/tests/tests_create_raid_pool_then_remove.yml index bee95f09..873263c8 100644 --- a/tests/tests_create_raid_pool_then_remove.yml +++ b/tests/tests_create_raid_pool_then_remove.yml @@ -15,6 +15,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 2 diff --git a/tests/tests_create_raid_volume_then_remove.yml b/tests/tests_create_raid_volume_then_remove.yml index bb292a53..22b3310e 100644 --- a/tests/tests_create_raid_volume_then_remove.yml +++ b/tests/tests_create_raid_volume_then_remove.yml @@ -10,6 +10,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 2 diff --git a/tests/tests_disk_errors.yml b/tests/tests_disk_errors.yml index cc71a31b..d9722b53 100644 --- a/tests/tests_disk_errors.yml +++ b/tests/tests_disk_errors.yml @@ -9,6 +9,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "10g" diff --git a/tests/tests_existing_lvm_pool.yml b/tests/tests_existing_lvm_pool.yml index 2490914e..209f031d 100644 --- a/tests/tests_existing_lvm_pool.yml +++ b/tests/tests_existing_lvm_pool.yml @@ -11,6 +11,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_group_size }}" diff --git a/tests/tests_fatals_raid_pool.yml b/tests/tests_fatals_raid_pool.yml index e03dfc1c..12246204 100644 --- a/tests/tests_fatals_raid_pool.yml +++ b/tests/tests_fatals_raid_pool.yml @@ -15,6 +15,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 2 diff --git a/tests/tests_fatals_raid_volume.yml b/tests/tests_fatals_raid_volume.yml index a8e6ceef..df5692a6 100644 --- a/tests/tests_fatals_raid_volume.yml +++ b/tests/tests_fatals_raid_volume.yml @@ -10,6 +10,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 2 diff --git a/tests/tests_filesystem_one_disk.yml b/tests/tests_filesystem_one_disk.yml index 1231baab..51c1f7ae 100644 --- a/tests/tests_filesystem_one_disk.yml +++ b/tests/tests_filesystem_one_disk.yml @@ -8,6 +8,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 1 diff --git a/tests/tests_luks_pool.yml b/tests/tests_luks_pool.yml index 62c2ae4c..9c46e32c 100644 --- a/tests/tests_luks_pool.yml +++ b/tests/tests_luks_pool.yml @@ -12,6 +12,12 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_size }}" @@ -55,6 +61,13 @@ not blivet_output.changed" msg: "Unexpected behavior w/ encrypted pool w/ no key" + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - name: Test key file handling block: - name: Create a key file diff --git a/tests/tests_lvm_auto_size_cap.yml b/tests/tests_lvm_auto_size_cap.yml index 32d43aa1..3d94a5fe 100644 --- a/tests/tests_lvm_auto_size_cap.yml +++ b/tests/tests_lvm_auto_size_cap.yml @@ -6,6 +6,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: 10g diff --git a/tests/tests_lvm_errors.yml b/tests/tests_lvm_errors.yml index 5feb99cf..428e74ca 100644 --- a/tests/tests_lvm_errors.yml +++ b/tests/tests_lvm_errors.yml @@ -16,6 +16,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_group_size }}" diff --git a/tests/tests_lvm_multiple_disks_multiple_volumes.yml b/tests/tests_lvm_multiple_disks_multiple_volumes.yml index 22554add..7232677e 100644 --- a/tests/tests_lvm_multiple_disks_multiple_volumes.yml +++ b/tests/tests_lvm_multiple_disks_multiple_volumes.yml @@ -11,6 +11,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_group_size }}" diff --git a/tests/tests_lvm_one_disk_multiple_volumes.yml b/tests/tests_lvm_one_disk_multiple_volumes.yml index 017cfd1a..752b251a 100644 --- a/tests/tests_lvm_one_disk_multiple_volumes.yml +++ b/tests/tests_lvm_one_disk_multiple_volumes.yml @@ -9,6 +9,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_group_size }}" diff --git a/tests/tests_lvm_one_disk_one_volume.yml b/tests/tests_lvm_one_disk_one_volume.yml index 6452f543..442d0378 100644 --- a/tests/tests_lvm_one_disk_one_volume.yml +++ b/tests/tests_lvm_one_disk_one_volume.yml @@ -10,6 +10,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_group_size }}" diff --git a/tests/tests_misc.yml b/tests/tests_misc.yml index afe753a4..4b6498e5 100644 --- a/tests/tests_misc.yml +++ b/tests/tests_misc.yml @@ -14,6 +14,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_group_size }}" diff --git a/tests/tests_missing_volume_type_in_pool.yml b/tests/tests_missing_volume_type_in_pool.yml index 96150977..53205989 100644 --- a/tests/tests_missing_volume_type_in_pool.yml +++ b/tests/tests_missing_volume_type_in_pool.yml @@ -9,6 +9,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 1 diff --git a/tests/tests_null_raid_pool.yml b/tests/tests_null_raid_pool.yml index 5c3c7859..3c678602 100644 --- a/tests/tests_null_raid_pool.yml +++ b/tests/tests_null_raid_pool.yml @@ -11,6 +11,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 2 diff --git a/tests/tests_raid_pool_options.yml b/tests/tests_raid_pool_options.yml index 2743ef09..2708fd81 100644 --- a/tests/tests_raid_pool_options.yml +++ b/tests/tests_raid_pool_options.yml @@ -15,6 +15,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 3 diff --git a/tests/tests_raid_volume_options.yml b/tests/tests_raid_volume_options.yml index 03ded84b..c3aa601c 100644 --- a/tests/tests_raid_volume_options.yml +++ b/tests/tests_raid_volume_options.yml @@ -10,6 +10,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 3 diff --git a/tests/tests_remove_mount.yml b/tests/tests_remove_mount.yml index ee3e3a7d..a40115f2 100644 --- a/tests/tests_remove_mount.yml +++ b/tests/tests_remove_mount.yml @@ -10,6 +10,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_size }}" diff --git a/tests/tests_remove_nonexistent_pool.yml b/tests/tests_remove_nonexistent_pool.yml index 660300c5..bffe32c6 100644 --- a/tests/tests_remove_nonexistent_pool.yml +++ b/tests/tests_remove_nonexistent_pool.yml @@ -12,6 +12,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: max_return: 1 diff --git a/tests/tests_resize.yml b/tests/tests_resize.yml index 4fd8583f..7dbcc2ae 100644 --- a/tests/tests_resize.yml +++ b/tests/tests_resize.yml @@ -18,6 +18,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_group_size }}" diff --git a/tests/tests_swap.yml b/tests/tests_swap.yml index 5742d28e..88675a3f 100644 --- a/tests/tests_swap.yml +++ b/tests/tests_swap.yml @@ -10,6 +10,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_size }}" diff --git a/tests/tests_volume_relabel.yml b/tests/tests_volume_relabel.yml index d083a950..244c0c93 100644 --- a/tests/tests_volume_relabel.yml +++ b/tests/tests_volume_relabel.yml @@ -10,6 +10,13 @@ - include_role: name: linux-system-roles.storage + - name: Mark tasks to be skipped + set_fact: + storage_skip_checks: + - blivet_available + - packages_installed + - service_facts + - include_tasks: get_unused_disk.yml vars: min_size: "{{ volume_size }}"