fix: variables not present in tests, id os from facts

willshersystems · Jun 21, 2024 · f5ac537 · f5ac537
1 parent 3af1491
commit f5ac537
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/tests/tests_second_service.yml b/tests/tests_second_service.yml
@@ -99,7 +99,8 @@
             src: "/etc/systemd/system/sshd2@.service"
           register: service_inst
           when:
-            - __sshd_socket_accept | bool
+            - ansible_facts['distribution'] != "Debian" or ansible_facts['distribution_major_version'] | int < 12
+            - not (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_version'] is version('24.04', '>='))
 
         - name: Check content of the created service file
           ansible.builtin.assert:

diff --git a/tests/tests_second_service_drop_in.yml b/tests/tests_second_service_drop_in.yml
@@ -111,7 +111,8 @@
                 src: "/etc/systemd/system/sshd2@.service"
               register: service_inst
               when:
-                - __sshd_socket_accept | bool
+                - ansible_facts['distribution'] != "Debian" or ansible_facts['distribution_major_version'] | int < 12
+                - not (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_version'] is version('24.04', '>='))
 
             - name: Check content of the created service file
               ansible.builtin.assert:

diff --git a/tests/tests_systemd_services.yml b/tests/tests_systemd_services.yml
@@ -117,7 +117,8 @@
       when:
         - ansible_facts['service_mgr'] == 'systemd' or
           (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '7')
-        - __sshd_socket_accept | bool
+        - ansible_facts['distribution'] != "Debian" or ansible_facts['distribution_major_version'] | int < 12
+        - not (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_version'] is version('24.04', '>='))
       block:
         - name: Read the distribution instantiated service file
           ansible.builtin.slurp: