replace centos 8 with oraclelinux 8

cloudscale-ch · Dec 2, 2022 · 0375c6f · 0375c6f
1 parent 347e9d8
commit 0375c6f
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 17 deletions.
diff --git a/molecule/pdns-43/molecule.yml b/molecule/pdns-43/molecule.yml
@@ -15,9 +15,9 @@ platforms:
     image: centos:7
     dockerfile_tpl: centos-systemd
 
-  - name: centos-8
+  - name: oraclelinux-8
     groups: ["pdns"]
-    image: centos:8
+    image: oraclelinux:8
     dockerfile_tpl: centos-systemd
 
   - name: ubuntu-1804

diff --git a/molecule/pdns-44/molecule.yml b/molecule/pdns-44/molecule.yml
@@ -15,9 +15,9 @@ platforms:
     image: centos:7
     dockerfile_tpl: centos-systemd
 
-  - name: centos-8
+  - name: oraclelinux-8
     groups: ["pdns"]
-    image: centos:8
+    image: oraclelinux:8
     dockerfile_tpl: centos-systemd
 
   - name: ubuntu-1804

diff --git a/molecule/pdns-45/molecule.yml b/molecule/pdns-45/molecule.yml
@@ -15,9 +15,9 @@ platforms:
     image: centos:7
     dockerfile_tpl: centos-systemd
 
-  - name: centos-8
+  - name: oraclelinux-8
     groups: ["pdns"]
-    image: centos:8
+    image: oraclelinux:8
     dockerfile_tpl: centos-systemd
 
   - name: ubuntu-2004

diff --git a/molecule/pdns-master/molecule.yml b/molecule/pdns-master/molecule.yml
@@ -15,9 +15,9 @@ platforms:
     image: centos:7
     dockerfile_tpl: centos-systemd
 
-  - name: centos-8
+  - name: oraclelinux-8
     groups: ["pdns"]
-    image: centos:8
+    image: oraclelinux:8
     dockerfile_tpl: centos-systemd
 
   - name: ubuntu-1804

diff --git a/molecule/resources/tests/all/test_common.py b/molecule/resources/tests/all/test_common.py
@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos']
+rhel_os = ['redhat', 'centos', 'ol']
 archlinux_os = ['arch']
 
 

diff --git a/molecule/resources/tests/backend-mysql/test_backend_mysql.py b/molecule/resources/tests/backend-mysql/test_backend_mysql.py
@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos']
+rhel_os = ['redhat', 'centos', 'ol']
 archlinux_os = ['arch']
 
 

diff --git a/molecule/resources/tests/backend-sqlite/test_backend_sqlite.py b/molecule/resources/tests/backend-sqlite/test_backend_sqlite.py
@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos']
+rhel_os = ['redhat', 'centos', 'ol']
 archlinux_os = ['arch']
 
 

diff --git a/molecule/resources/tests/repo-43/test_repo_43.py b/molecule/resources/tests/repo-43/test_repo_43.py
@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos']
+rhel_os = ['redhat', 'centos', 'ol']
 
 
 def test_repo_file(host):

diff --git a/molecule/resources/tests/repo-44/test_repo_44.py b/molecule/resources/tests/repo-44/test_repo_44.py
@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos']
+rhel_os = ['redhat', 'centos', 'ol']
 
 
 def test_repo_file(host):

diff --git a/molecule/resources/tests/repo-master/test_repo_master.py b/molecule/resources/tests/repo-master/test_repo_master.py
@@ -1,6 +1,6 @@
 
 debian_os = ['debian', 'ubuntu']
-rhel_os = ['redhat', 'centos']
+rhel_os = ['redhat', 'centos', 'ol']
 
 
 def test_repo_file(host):

diff --git a/tasks/repo-RedHat.yml b/tasks/repo-RedHat.yml
@@ -8,11 +8,18 @@
       state: present
     when: ansible_distribution in [ 'CentOS' ]
 
-  - name: Install epel-release on RHEL/OracleLinux
-    yum:
+  - name: Install epel-release on RHEL
+    package:
       name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
       state: present
-    when: ansible_distribution in [ 'RedHat', 'OracleLinux' ]
+    when: ansible_distribution in [ 'RedHat' ]
+
+  # FIXME: this only works for 8
+  - name: Install epel-release on OracleLinux
+    package:
+      name: oracle-epel-release-el8
+      state: present
+    when: ansible_distribution in [ 'OracleLinux' ]
 
   when: pdns_install_epel