Merge pull request #209 from romeroalx/test-commit-alma-rocky

Add support and tests for Rocky and AlmaLinux. Supersedes #185

molecule/pdns-46/molecule.yml

@@ -20,6 +20,16 @@ platforms:
     image: oraclelinux:8
     dockerfile_tpl: centos-systemd
 
+  - name: rockylinux-8
+    groups: ["pdns"]
+    image: rockylinux:8
+    dockerfile_tpl: centos-systemd
+
+  - name: almalinux-8
+    groups: ["pdns"]
+    image: almalinux:8
+    dockerfile_tpl: centos-systemd
+
   - name: ubuntu-2004
     groups: ["pdns"]
     image: ubuntu:20.04

molecule/pdns-47/molecule.yml

@@ -15,6 +15,26 @@ platforms:
     image: centos:7
     dockerfile_tpl: centos-systemd
 
+  - name: rockylinux-8
+    groups: ["pdns"]
+    image: rockylinux:8
+    dockerfile_tpl: centos-systemd
+
+  - name: almalinux-8
+    groups: ["pdns"]
+    image: almalinux:8
+    dockerfile_tpl: centos-systemd
+
+  - name: rockylinux-9
+    groups: ["pdns"]
+    image: rockylinux:9.0
+    dockerfile_tpl: centos-systemd
+
+  - name: almalinux-9
+    groups: ["pdns"]
+    image: almalinux:9
+    dockerfile_tpl: centos-systemd
+
   - name: oraclelinux-9
     groups: ["pdns"]
     image: oraclelinux:9

molecule/pdns-48/molecule.yml

@@ -15,6 +15,26 @@ platforms:
     image: centos:7
     dockerfile_tpl: centos-systemd
 
+  - name: rockylinux-8
+    groups: ["pdns"]
+    image: rockylinux:8
+    dockerfile_tpl: centos-systemd
+
+  - name: almalinux-8
+    groups: ["pdns"]
+    image: almalinux:8
+    dockerfile_tpl: centos-systemd
+
+  - name: rockylinux-9
+    groups: ["pdns"]
+    image: rockylinux:9.0
+    dockerfile_tpl: centos-systemd
+
+  - name: almalinux-9
+    groups: ["pdns"]
+    image: almalinux:9
+    dockerfile_tpl: centos-systemd
+
   - name: oraclelinux-9
     groups: ["pdns"]
     image: oraclelinux:9

molecule/pdns-master/molecule.yml

@@ -15,6 +15,26 @@ platforms:
     image: centos:7
     dockerfile_tpl: centos-systemd
 
+  - name: rockylinux-8
+    groups: ["pdns"]
+    image: rockylinux:8
+    dockerfile_tpl: centos-systemd
+
+  - name: almalinux-8
+    groups: ["pdns"]
+    image: almalinux:8
+    dockerfile_tpl: centos-systemd
+
+  - name: rockylinux-9
+    groups: ["pdns"]
+    image: rockylinux:9.0
+    dockerfile_tpl: centos-systemd
+
+  - name: almalinux-9
+    groups: ["pdns"]
+    image: almalinux:9
+    dockerfile_tpl: centos-systemd
+
   - name: oraclelinux-9
     groups: ["pdns"]
     image: oraclelinux:9

molecule/resources/Dockerfile.centos-systemd.j2

@@ -5,7 +5,7 @@ FROM {{ item.image }}
 ENV container docker
 
 # Configure systemd to run into the container (see https://hub.docker.com/_/centos/)
-RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+RUN (cd /lib/systemd/system/sysinit.target.wants/ && for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
 rm -f /lib/systemd/system/multi-user.target.wants/*;\
 rm -f /etc/systemd/system/*.wants/*;\
 rm -f /lib/systemd/system/local-fs.target.wants/*; \
@@ -22,6 +22,6 @@ VOLUME [ "/sys/fs/cgroup" ]
 
 CMD ["/usr/sbin/init"]
 
-RUN if [ $(command -v dnf) ] && [ $(rpm -E %{rhel}) -eq 8 ]; then dnf makecache && dnf --assumeyes install python3 python3-devel python*-dnf bash iproute && dnf clean all; \
+RUN if [ $(command -v dnf) ] && [ $(rpm -E %{rhel}) -eq 8 ] || [ $(rpm -E %{rhel}) -eq 9 ]; then dnf makecache && dnf --assumeyes install python3 python3-devel python*-dnf bash iproute && dnf clean all; \
     elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash iproute && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl net-tools bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; fi

molecule/resources/tests/all/test_common.py

@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos', 'ol']
+rhel_os = ['redhat', 'centos', 'ol', 'rocky', 'almalinux']
 archlinux_os = ['arch']
 
 

molecule/resources/tests/backend-mysql/test_backend_mysql.py

@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos', 'ol']
+rhel_os = ['redhat', 'centos', 'ol', 'rocky', 'almalinux']
 archlinux_os = ['arch']
 
 

molecule/resources/tests/backend-sqlite/test_backend_sqlite.py

@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos', 'ol']
+rhel_os = ['redhat', 'centos', 'ol', 'rocky', 'almalinux']
 archlinux_os = ['arch']
 
 

molecule/resources/tests/pdns-48/test_repo_48.py

@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos', 'ol']
+rhel_os = ['redhat', 'centos', 'ol', 'rocky', 'almalinux']
 
 
 def test_repo_file(host):

molecule/resources/tests/repo-45/test_repo_45.py

@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos', 'ol']
+rhel_os = ['redhat', 'centos', 'ol', 'rocky', 'almalinux']
 
 
 def test_repo_file(host):

molecule/resources/tests/repo-46/test_repo_46.py

@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos', 'ol']
+rhel_os = ['redhat', 'centos', 'ol', 'rocky', 'almalinux']
 
 
 def test_repo_file(host):

molecule/resources/tests/repo-47/test_repo_47.py

@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos', 'ol']
+rhel_os = ['redhat', 'centos', 'ol', 'rocky', 'almalinux']
 
 
 def test_repo_file(host):

molecule/resources/tests/repo-master/test_repo_master.py

@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos', 'ol']
+rhel_os = ['redhat', 'centos', 'ol', 'rocky', 'almalinux']
 
 
 def test_repo_file(host):

tasks/repo-RedHat.yml

@@ -6,7 +6,7 @@
     yum:
       name: epel-release
       state: present
-    when: ansible_distribution in [ 'CentOS' ]
+    when: ansible_distribution in [ 'CentOS', 'Rocky', 'AlmaLinux' ]
 
   - name: Install epel-release on RHEL
     package:
@@ -29,7 +29,7 @@
     name: yum-plugin-priorities
     state: present
   when:
-    - ansible_distribution in [ 'CentOS' ]
+    - ansible_distribution in [ 'CentOS', 'Rocky', 'AlmaLinux' ]
     - ansible_distribution_major_version | int < 8
 
 - name: Add the PowerDNS YUM Repository