Skip to content

Commit

Permalink
Added skip checks feature to speed up the tests (#218)
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
japokorn authored Oct 4, 2021
1 parent dcf3125 commit f2a6a2b
Show file tree
Hide file tree
Showing 34 changed files with 247 additions and 0 deletions.
10 changes: 10 additions & 0 deletions tasks/main-blivet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_change_disk_fs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_change_disk_mount.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_change_fs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_change_fs_use_partitions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_change_mount.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_create_disk_then_remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_create_lv_size_equal_to_vg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_create_lvm_pool_then_remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_create_lvmvdo_then_remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_create_partition_volume_then_remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_create_raid_pool_then_remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_create_raid_volume_then_remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_disk_errors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_existing_lvm_pool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_fatals_raid_pool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_fatals_raid_volume.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_filesystem_one_disk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions tests/tests_luks_pool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_lvm_auto_size_cap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_lvm_errors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_lvm_multiple_disks_multiple_volumes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_lvm_one_disk_multiple_volumes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_lvm_one_disk_one_volume.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
7 changes: 7 additions & 0 deletions tests/tests_missing_volume_type_in_pool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit f2a6a2b

Please sign in to comment.