Skip to content

Commit f73a77b

Browse files
committed
Fix dependent preparation for tests.
1 parent f8d8488 commit f73a77b

File tree

26 files changed

+181
-31
lines changed

26 files changed

+181
-31
lines changed

tests/integration/files/includes/tasks/prep.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
- name: "Print OS Information."
3-
ansible.builtin.debug:
4-
var: ansible_lsb
2+
# - name: "Print OS Information."
3+
# ansible.builtin.debug:
4+
# var: ansible_lsb
55

6-
- name: "Print Identifier."
7-
ansible.builtin.debug:
8-
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
6+
# - name: "Print Identifier."
7+
# ansible.builtin.debug:
8+
# msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
99

1010
- name: "Install dependencies."
1111
ansible.builtin.package:

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Inject a Key into the Sites." # noqa no-changed-when
2632
ansible.builtin.shell: |

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/vars/
1111
- tests/integration/files/includes/vars/
1212

13+
- name: "Print Identifier."
14+
ansible.builtin.debug:
15+
msg: "{{ ansible_facts.system_vendor }} {{ ansible_facts.product_name }} running {{ ansible_facts.virtualization_type }}"
16+
1317
- name: "Run preparations."
1418
ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', checkmk_var_params) }}"
1519
vars:
@@ -20,7 +24,9 @@
2024
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2125
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2226
- tests/integration/files/includes/tasks/
23-
when: ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container"
27+
when: |
28+
(ansible_facts.system_vendor == "Dell Inc." and 'Latitude' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
29+
or (ansible_facts.system_vendor == "QEMU" and 'Ubuntu' in ansible_facts.product_name and ansible_facts.virtualization_type == "container")
2430
2531
- name: "Testing."
2632
ansible.builtin.include_tasks: test.yml

0 commit comments

Comments
 (0)