From c1b4c955e793a56af5a57c6f53293035e041a527 Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Tue, 11 Jun 2024 02:45:25 +0100 Subject: [PATCH] fix(tests): remove at check, not needed --- tests/tests_systemd_services.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/tests_systemd_services.yml b/tests/tests_systemd_services.yml index 94ee6ba..bcf81aa 100644 --- a/tests/tests_systemd_services.yml +++ b/tests/tests_systemd_services.yml @@ -12,7 +12,6 @@ - /etc/systemd/system/ssh@.service - /etc/systemd/system/ssh.socket __sshd_test_service_name: sshd - __sshd_test_service_name_at: '@' __sshd_service_list: [] __sshd_service_inst_list: [] __sshd_socket_list: [] @@ -23,12 +22,6 @@ when: - ansible_facts['os_family'] == "Debian" - - name: No at in the service on Ubuntu 24.04 - ansible.builtin.set_fact: - __sshd_test_service_name_at: '' - when: - - ansible_facts['distribution']=='Ubuntu' and ansible_facts['distribution_version'] is version('24.04', '>=') - - name: Backup configuration files ansible.builtin.include_tasks: tasks/backup.yml @@ -127,11 +120,11 @@ - ansible_facts['service_mgr'] == 'systemd' or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '7') - 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', '>=')) # FIX: Skip for Ubuntu Noble due to significant changes + - not (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_version'] is version('24.04', '>=')) # 24.04 has no sshd@.server in the package block: - name: Read the distribution instantiated service file ansible.builtin.slurp: - src: "/lib/systemd/system/{{ __sshd_test_service_name }}{{ __sshd_test_service_name_at }}.service" + src: "/lib/systemd/system/{{ __sshd_test_service_name }}.service" register: service_inst_old - name: Read the created instantiated service file