Merge pull request #9 from T-Systems-MMS/add_ubuntu_to_tests

added Debian to test coverage

Author: xFuture603

.github/workflows/CI.yml

@@ -66,6 +66,7 @@ jobs:
           distro:
             - centos7
             - rockylinux8
+            - debian11
 
       steps:
         - name: Check out code

roles/icinga_agent/defaults/main.yml

@@ -14,3 +14,10 @@ icinga_agent_api_conf: |
   accept_commands = true
 
 icinga_agent_repositoryd_directory: false
+
+icinga2_user:
+  Debian: nagios
+  RedHat: icinga
+icinga2_group:
+  Debian: nagios
+  RedHat: icinga

roles/icinga_agent/molecule/default/converge.yml

@@ -23,6 +23,53 @@
       tags:
         - molecule-idempotence-notest
 
+    - name: install icinga2 basic packages
+      apt:
+        name: gnupg
+        state: present
+        update_cache: true
+      when: ansible_os_family == 'Debian'
+      tags:
+        - molecule-idempotence-notest
+
+    - name: add icinga2 repo key
+      apt_key:
+        url: "http://packages.icinga.com/icinga.key"
+        state: present
+      when: ansible_os_family == 'Debian'
+      tags:
+        - molecule-idempotence-notest
+
+    - name: add icinga2 repository
+      apt_repository:
+        repo: "{{ item }}"
+        state: present
+        update_cache: true
+      with_items:
+        - deb http://packages.icinga.com/debian icinga-bullseye main
+        - deb-src http://packages.icinga.com/debian icinga-bullseye main
+      when: ansible_os_family == 'Debian'
+      tags:
+        - molecule-idempotence-notest
+
+    - name: install icinga2 build dependencies
+      apt:
+        pkg: "icinga2"
+        state: "build-dep"
+        update_cache: true
+      when: ansible_os_family == 'Debian'
+      tags:
+        - molecule-idempotence-notest
+
+    - name: install icinga2 basic packages
+      apt:
+        name: "icinga2"
+        state: "present"
+        update_cache: true
+      when: ansible_os_family == 'Debian'
+      tags:
+        - molecule-idempotence-notest
+
   collections:
     - t_systems_mms.ansible_collection_icinga
 
@@ -51,58 +98,109 @@
         state: file
       register: result_icinga2_conf
 
-    - name: validate icinga2.conf results
+    - name: validate icinga2.conf results for RedHat based Distributions
       assert:
         that:
           - "result_icinga2_conf.state == 'file'"
           - "result_icinga2_conf.mode == '0640'"
           - "result_icinga2_conf.owner == 'icinga'"
           - "result_icinga2_conf.group == 'icinga'"
+      when: ansible_os_family == 'RedHat'
+
+    - name: validate icinga2.conf results for Debian based Distributions
+      assert:
+        that:
+          - "result_icinga2_conf.state == 'file'"
+          - "result_icinga2_conf.mode == '0640'"
+          - "result_icinga2_conf.owner == 'nagios'"
+          - "result_icinga2_conf.group == 'nagios'"
+      when: ansible_os_family == 'Debian'
 
     - name: verify that constants.conf exists
       file:
         path: /etc/icinga2/constants.conf
         state: file
       register: result_constants_conf
 
-    - name: validate constants.conf results
+    - name: validate constants.conf results for RedHat based Distributions
       assert:
         that:
           - "result_constants_conf.state == 'file'"
           - "result_constants_conf.mode == '0640'"
           - "result_constants_conf.owner == 'icinga'"
           - "result_constants_conf.group == 'icinga'"
+      when: ansible_os_family == 'RedHat'
+
+    - name: validate constants.conf results for Debian based Distributions
+      assert:
+        that:
+          - "result_constants_conf.state == 'file'"
+          - "result_constants_conf.mode == '0640'"
+          - "result_constants_conf.owner == 'nagios'"
+          - "result_constants_conf.group == 'nagios'"
+      when: ansible_os_family == 'Debian'
 
     - name: verify that zones.conf exists
       file:
         path: /etc/icinga2/zones.conf
         state: file
       register: result_zones_conf
 
-    - name: validate zones.conf results
+    - name: validate zones.conf results for RedHat based Distributions
       assert:
         that:
           - "result_zones_conf.state == 'file'"
           - "result_zones_conf.mode == '0640'"
           - "result_zones_conf.owner == 'icinga'"
           - "result_zones_conf.group == 'icinga'"
+      when: ansible_os_family == 'RedHat'
+
+    - name: validate zones.conf results for Debian based Distributions
+      assert:
+        that:
+          - "result_zones_conf.state == 'file'"
+          - "result_zones_conf.mode == '0640'"
+          - "result_zones_conf.owner == 'nagios'"
+          - "result_zones_conf.group == 'nagios'"
+      when: ansible_os_family == 'Debian'
 
     - name: verify that api.conf exists
       file:
         path: /etc/icinga2/features-available/api.conf
         state: file
       register: result_api_conf
 
-    - name: validate api.conf results
+    - name: validate api.conf results for RedHat based Distributions
       assert:
         that:
           - "result_api_conf.state == 'file'"
           - "result_api_conf.mode == '0640'"
           - "result_api_conf.owner == 'icinga'"
           - "result_api_conf.group == 'icinga'"
+      when: ansible_os_family == 'RedHat'
+
+    - name: validate api.conf results for Debian based Distributions
+      assert:
+        that:
+          - "result_api_conf.state == 'file'"
+          - "result_api_conf.mode == '0640'"
+          - "result_api_conf.owner == 'nagios'"
+          - "result_api_conf.group == 'nagios'"
+      when: ansible_os_family == 'Debian'
+
+    # - name: verify that icinga2 package is installed
+    #   yum:
+    #     name: icinga2
+    #     state: present
+    #   when: ansible_os_family == 'RedHat'
+
+    # - name: verify that icinga2 package is installed for Debian based systems
+    #   apt:
+    #     name: icinga2
+    #     state: present
+    #   when: ansible_os_family == 'Debian'
 
     - name: verify that icinga2 package is installed
-      yum:
+      ansible.builtin.package:
         name: icinga2
         state: present
-      when: ansible_os_family == 'RedHat'

roles/icinga_agent/molecule/default/molecule.yml

@@ -10,6 +10,6 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     pre_build_image: true
-    command: "/usr/sbin/init"
+    command: ""
 provisioner:
   name: ansible

roles/icinga_agent/tasks/main.yml

@@ -9,8 +9,8 @@
 - name: create /etc/icinga2/repository.d
   ansible.builtin.file:
     dest: "/etc/icinga2/repository.d"
-    owner: icinga
-    group: icinga
+    owner: "{{ icinga2_user[ansible_os_family] }}"
+    group: "{{ icinga2_group[ansible_os_family] }}"
     state: directory
   when:
     - icinga_agent_repositoryd_directory is defined
@@ -19,8 +19,8 @@
   ansible.builtin.template:
     src: "{{ item }}"
     dest: "/etc/icinga2/{{ item | basename | regex_replace('.j2', '') }}"
-    owner: icinga
-    group: icinga
+    owner: "{{ icinga2_user[ansible_os_family] }}"
+    group: "{{ icinga2_group[ansible_os_family] }}"
     mode: 0640
   with_fileglob:
     - "../templates/configuration/*"
@@ -31,8 +31,8 @@
   ansible.builtin.template:
     src: "{{ item }}"
     dest: "/etc/icinga2/features-available/{{ item | basename | regex_replace('.j2', '') }}"
-    owner: icinga
-    group: icinga
+    owner: "{{ icinga2_user[ansible_os_family] }}"
+    group: "{{ icinga2_group[ansible_os_family] }}"
     mode: 0640
   with_fileglob:
     - "../templates/features/*"
@@ -43,8 +43,8 @@
   ansible.builtin.template:
     src: "{{ item }}"
     dest: "/etc/icinga2/features-available/{{ item | basename | regex_replace('.j2', '') }}"
-    owner: icinga
-    group: icinga
+    owner: "{{ icinga2_user[ansible_os_family] }}"
+    group: "{{ icinga2_group[ansible_os_family] }}"
     mode: 0640
   with_fileglob:
     - "{{ icinga_agent_custom_features_template_path }}"