Skip to content

Commit 957cbb3

Browse files
robin-checkmkrobin-checkmk
committed
Simplify preparations conditionals.
1 parent c8b159e commit 957cbb3

File tree

31 files changed

+96
-96
lines changed

31 files changed

+96
-96
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2525
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2626
- tests/integration/files/includes/tasks/
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")
27+
when:
28+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
29+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
3030

3131
- name: "Testing."
3232
ansible.builtin.include_tasks: test.yml

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2525
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2626
- tests/integration/files/includes/tasks/
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")
27+
when:
28+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
29+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
3030

3131
- name: "Inject a Key into the Sites when running outside of the Container." # noqa no-changed-when
3232
ansible.builtin.shell: |
@@ -79,9 +79,9 @@
7979
loop: "{{ checkmk_var_test_sites }}"
8080
loop_control:
8181
loop_var: outer_item
82-
when: |
83-
(ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name'] and ansible_facts['virtualization_type'] == "container")
84-
or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'] and ansible_facts['virtualization_type'] == "container")
82+
when:
83+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
84+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
8585

8686
- name: "Testing."
8787
ansible.builtin.include_tasks: test.yml

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2525
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2626
- tests/integration/files/includes/tasks/
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")
27+
when:
28+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
29+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
3030

3131
- name: "Testing."
3232
ansible.builtin.include_tasks: test.yml

‎tests/integration/targets/dcd/tasks/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2525
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2626
- tests/integration/files/includes/tasks/
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")
27+
when:
28+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
29+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
3030

3131
- name: "Testing."
3232
ansible.builtin.include_tasks: test.yml

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2525
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2626
- tests/integration/files/includes/tasks/
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")
27+
when:
28+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
29+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
3030

3131
- name: "Testing."
3232
ansible.builtin.include_tasks: test.yml

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2525
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2626
- tests/integration/files/includes/tasks/
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")
27+
when:
28+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
29+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
3030

3131
- name: "Testing."
3232
ansible.builtin.include_tasks: test.yml

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2525
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2626
- tests/integration/files/includes/tasks/
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")
27+
when:
28+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
29+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
3030

3131
- name: "Testing."
3232
ansible.builtin.include_tasks: test.yml

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2525
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2626
- tests/integration/files/includes/tasks/
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")
27+
when:
28+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
29+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
3030

3131
- name: "Testing."
3232
ansible.builtin.include_tasks: test.yml

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2525
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2626
- tests/integration/files/includes/tasks/
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")
27+
when:
28+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
29+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
3030

3131
- name: "Testing."
3232
ansible.builtin.include_tasks: test.yml

‎tests/integration/targets/ldap/tasks/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
- /home/runner/work/ansible-collection-checkmk.general/ansible-collection-checkmk.general/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2525
- /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/
2626
- tests/integration/files/includes/tasks/
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")
27+
when:
28+
- ansible_facts['virtualization_type'] in ['container', 'podman', 'docker']
29+
- (ansible_facts['system_vendor'] == "Dell Inc." and 'Latitude' in ansible_facts['product_name']) or (ansible_facts['system_vendor'] == "QEMU" and 'Ubuntu' in ansible_facts['product_name'])
3030

3131
- name: "Testing."
3232
ansible.builtin.include_tasks: test.yml

0 commit comments

Comments
 (0)