Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/tasks/cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
- name: Use role purge to remove settings
block:
- name: Run role with purge to remove everything
include_role:
name: linux-system-roles.kernel_settings
include_tasks: tasks/run_role_with_clear_facts.yml
vars:
kernel_settings_purge: true
kernel_settings_sysctl: []
Expand Down
37 changes: 37 additions & 0 deletions tests/tasks/run_role_with_clear_facts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
# Task file: clear_facts, run linux-system-roles.kernel_settings.
# Include this with include_tasks or import_tasks
# Input:
# - __sr_tasks_from: tasks_from to run - same as tasks_from in include_role
# - __sr_public: export private vars from role - same as public in include_role
# - __sr_failed_when: set to false to ignore role errors - same as failed_when in include_role
- name: Clear facts
meta: clear_facts

# note that you can use failed_when with import_role but not with include_role
# so this simulates the __sr_failed_when false case
# Q: Why do we need a separate task to run the role normally? Why not just
# run the role in the block and rethrow the error in the rescue block?
# A: Because you cannot rethrow the error in exactly the same way as the role does.
# It might be possible to exactly reconstruct ansible_failed_result but it's not worth the effort.
- name: Run the role with __sr_failed_when false
when:
- __sr_failed_when is defined
- not __sr_failed_when
block:
- name: Run the role
include_role:
name: linux-system-roles.kernel_settings
tasks_from: "{{ __sr_tasks_from | default('main') }}"
public: "{{ __sr_public | default(false) }}"
rescue:
- name: Ignore the failure when __sr_failed_when is false
debug:
msg: Ignoring failure when __sr_failed_when is false

- name: Run the role normally
include_role:
name: linux-system-roles.kernel_settings
tasks_from: "{{ __sr_tasks_from | default('main') }}"
public: "{{ __sr_public | default(false) }}"
when: __sr_failed_when | d(true)
5 changes: 2 additions & 3 deletions tests/tests_bool_not_allowed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
- name: Validate no boolean values for sysctl values
block:
- name: Try to pass a boolean value for sysctl value
include_role:
name: linux-system-roles.kernel_settings
public: true
include_tasks: tasks/run_role_with_clear_facts.yml
vars:
__sr_public: true
kernel_settings_sysctl:
- name: valid_value
value: "true"
Expand Down
14 changes: 5 additions & 9 deletions tests/tests_change_settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,9 @@
enabled: true

- name: Apply kernel_settings
include_role:
name: linux-system-roles.kernel_settings
public: true
include_tasks: tasks/run_role_with_clear_facts.yml
vars:
__sr_public: true
kernel_settings_sysctl:
- name: fs.file-max
value: 400000
Expand Down Expand Up @@ -120,8 +119,7 @@
changed_when: false

- name: Apply role again and remove settings
include_role:
name: linux-system-roles.kernel_settings
include_tasks: tasks/run_role_with_clear_facts.yml
vars:
kernel_settings_reboot_ok: true
kernel_settings_sysctl:
Expand All @@ -148,8 +146,7 @@
changed_when: false

- name: Apply kernel_settings for removing
include_role:
name: linux-system-roles.kernel_settings
include_tasks: tasks/run_role_with_clear_facts.yml
vars:
kernel_settings_reboot_ok: true
kernel_settings_sysctl:
Expand Down Expand Up @@ -181,8 +178,7 @@
changed_when: false

- name: Apply kernel_settings for removing section
include_role:
name: linux-system-roles.kernel_settings
include_tasks: tasks/run_role_with_clear_facts.yml
vars:
kernel_settings_reboot_ok: true
kernel_settings_sysctl:
Expand Down
7 changes: 3 additions & 4 deletions tests/tests_default.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
---
- name: Ensure that the role runs with default parameters
hosts: all
gather_facts: false
tasks:
- name: Run test
block:
- name: Run role with no settings
include_role:
name: linux-system-roles.kernel_settings
public: true
include_tasks: tasks/run_role_with_clear_facts.yml
vars:
__sr_public: true

always:
- name: Cleanup
Expand Down
1 change: 0 additions & 1 deletion tests/tests_include_vars_from_parent.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Test role variable override
hosts: all
gather_facts: true
tasks:
- name: Run test
block:
Expand Down
10 changes: 4 additions & 6 deletions tests/tests_simple_settings.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Test simple kernel settings
hosts: all
gather_facts: true
tags:
- tests::reboot
tasks:
Expand All @@ -23,9 +22,9 @@
# __kernel_settings_profile_filename to verify
# that the settings were applied correctly
- name: Apply the settings - call the role
include_role:
name: linux-system-roles.kernel_settings
public: true
include_tasks: tasks/run_role_with_clear_facts.yml
vars:
__sr_public: true

- name: Verify that settings were applied correctly
include_tasks: tasks/assert_kernel_settings.yml
Expand Down Expand Up @@ -61,8 +60,7 @@
- not kernel_settings_test_reboot_ok | d(false)

- name: Apply the settings again to check idempotency
include_role:
name: linux-system-roles.kernel_settings
include_tasks: tasks/run_role_with_clear_facts.yml

- name: Ensure role reported not changed
assert:
Expand Down
Loading