Merge branch 'robertdebock:master' into master

.github/workflows/molecule.yml

@@ -35,22 +35,18 @@ jobs:
             tag: "bullseye"
           - image: "debian"
             tag: "buster"
-          - image: "enterpriselinux"
-            tag: "7"
           - image: "enterpriselinux"
             tag: "8"
           - image: "enterpriselinux"
             tag: "latest"
           - image: "fedora"
             tag: "38"
           - image: "fedora"
-            tag: "latest"
+            tag: "39"
           - image: "opensuse"
             tag: "latest"
           - image: "ubuntu"
-            tag: "latest"
-          - image: "ubuntu"
-            tag: "focal"
+            tag: "jammy"
     steps:
       - name: checkout
         uses: actions/checkout@v4

.gitlab-ci.yml

@@ -18,22 +18,18 @@ molecule:
         tag: "bullseye"
       - image: "debian"
         tag: "buster"
-      - image: "enterpriselinux"
-        tag: "7"
       - image: "enterpriselinux"
         tag: "8"
       - image: "enterpriselinux"
         tag: "latest"
       - image: "fedora"
         tag: "38"
       - image: "fedora"
-        tag: "latest"
+        tag: "39"
       - image: "opensuse"
         tag: "latest"
       - image: "ubuntu"
-        tag: "latest"
-      - image: "ubuntu"
-        tag: "focal"
+        tag: "jammy"
 
 galaxy:
   script:

README.md

@@ -251,9 +251,6 @@ The machine needs to be prepared. In CI this is done using [`molecule/default/pr
     # The roles buildtools, python_pip and postgres are required.
     # bareos-dir needs to connect to a database.
     - role: robertdebock.buildtools
-    # EPEL is required for RHEL7.
-    - role: robertdebock.epel
-    - role: robertdebock.python_pip
     - role: robertdebock.postgres
     # The roles core_dependencies and postfix are  required for the `bareos_role`: "dir".
     # bareos-dir needs to send emails.
@@ -349,7 +346,6 @@ The following roles are used to prepare a system. You can prepare your system in
 |[robertdebock.bootstrap](https://galaxy.ansible.com/robertdebock/bootstrap)|[![Build Status GitHub](https://github.com/robertdebock/ansible-role-bootstrap/workflows/Ansible%20Molecule/badge.svg)](https://github.com/robertdebock/ansible-role-bootstrap/actions)|[![Build Status GitLab](https://gitlab.com/robertdebock-iac/ansible-role-bootstrap/badges/master/pipeline.svg)](https://gitlab.com/robertdebock-iac/ansible-role-bootstrap)|
 |[robertdebock.bareos_repository](https://galaxy.ansible.com/robertdebock/bareos_repository)|[![Build Status GitHub](https://github.com/robertdebock/ansible-role-bareos_repository/workflows/Ansible%20Molecule/badge.svg)](https://github.com/robertdebock/ansible-role-bareos_repository/actions)|[![Build Status GitLab](https://gitlab.com/robertdebock-iac/ansible-role-bareos_repository/badges/master/pipeline.svg)](https://gitlab.com/robertdebock-iac/ansible-role-bareos_repository)|
 |[robertdebock.buildtools](https://galaxy.ansible.com/robertdebock/buildtools)|[![Build Status GitHub](https://github.com/robertdebock/ansible-role-buildtools/workflows/Ansible%20Molecule/badge.svg)](https://github.com/robertdebock/ansible-role-buildtools/actions)|[![Build Status GitLab](https://gitlab.com/robertdebock-iac/ansible-role-buildtools/badges/master/pipeline.svg)](https://gitlab.com/robertdebock-iac/ansible-role-buildtools)|
-|[robertdebock.epel](https://galaxy.ansible.com/robertdebock/epel)|[![Build Status GitHub](https://github.com/robertdebock/ansible-role-epel/workflows/Ansible%20Molecule/badge.svg)](https://github.com/robertdebock/ansible-role-epel/actions)|[![Build Status GitLab](https://gitlab.com/robertdebock-iac/ansible-role-epel/badges/master/pipeline.svg)](https://gitlab.com/robertdebock-iac/ansible-role-epel)|
 |[robertdebock.python_pip](https://galaxy.ansible.com/robertdebock/python_pip)|[![Build Status GitHub](https://github.com/robertdebock/ansible-role-python_pip/workflows/Ansible%20Molecule/badge.svg)](https://github.com/robertdebock/ansible-role-python_pip/actions)|[![Build Status GitLab](https://gitlab.com/robertdebock-iac/ansible-role-python_pip/badges/master/pipeline.svg)](https://gitlab.com/robertdebock-iac/ansible-role-python_pip)|
 |[robertdebock.postgres](https://galaxy.ansible.com/robertdebock/postgres)|[![Build Status GitHub](https://github.com/robertdebock/ansible-role-postgres/workflows/Ansible%20Molecule/badge.svg)](https://github.com/robertdebock/ansible-role-postgres/actions)|[![Build Status GitLab](https://gitlab.com/robertdebock-iac/ansible-role-postgres/badges/master/pipeline.svg)](https://gitlab.com/robertdebock-iac/ansible-role-postgres)|
 
@@ -367,10 +363,10 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
 |container|tags|
 |---------|----|
 |[Debian](https://hub.docker.com/r/robertdebock/debian)|bookworm, bullseye, buster|
-|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|7, 8, 9|
+|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|8, 9|
 |[Fedora](https://hub.docker.com/r/robertdebock/fedora)|38, 39|
 |[opensuse](https://hub.docker.com/r/robertdebock/opensuse)|all|
-|[Ubuntu](https://hub.docker.com/r/robertdebock/ubuntu)|jammy, focal|
+|[Ubuntu](https://hub.docker.com/r/robertdebock/ubuntu)|jammy|
 
 The minimum version of Ansible required is 2.12, tests have been done to:
 

meta/main.yml

@@ -15,7 +15,6 @@ galaxy_info:
         - buster
     - name: EL
       versions:
-        - "7"
         - "8"
         - "9"
     - name: Fedora
@@ -28,7 +27,6 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - jammy
-        - focal
 
   galaxy_tags:
     - bareos

molecule/default/prepare.yml

@@ -9,9 +9,6 @@
     # The roles buildtools, python_pip and postgres are required.
     # bareos-dir needs to connect to a database.
     - role: robertdebock.buildtools
-    # EPEL is required for RHEL7.
-    - role: robertdebock.epel
-    - role: robertdebock.python_pip
     - role: robertdebock.postgres
     # The roles core_dependencies and postfix are  required for the `bareos_role`: "dir".
     # bareos-dir needs to send emails.

requirements.yml

@@ -4,8 +4,6 @@ roles:
   - name: robertdebock.bareos_repository
   # The `buildtools`, `python_pip` and `postgres` roles provide a database.
   - name: robertdebock.buildtools
-  # EPEL is required for python-pip on RHEL7.
-  - name: robertdebock.epel
   - name: robertdebock.python_pip
   - name: robertdebock.postgres
   # The `core_dependencies` and `postfix` roles provide mailing capabilities for the `bareos_role`: "dir".