Switch to `oraclelinux:7` for CentOS 7 repo tests.

diff --git a/build-scripts/docker/repo-test/generate-repo-files.py b/build-scripts/docker/repo-test/generate-repo-files.py
index 805596e089870c214993e69fea359c896700199a..63af7fbd5f822d906cb8b8c9b95cd12763a3cf05 100755 (executable)
--- a/build-scripts/docker/repo-test/generate-repo-files.py
+++ b/build-scripts/docker/repo-test/generate-repo-files.py
@@ -80,7 +80,7 @@ def write_dockerfile (os, os_version, release):
         os_image = os
 
     if release.startswith('auth-'):
-        if os in ('centos', 'el'):
+        if os in ('el'):
             pkg = 'pdns'
         else:
             pkg = 'pdns-server'
@@ -140,7 +140,7 @@ def write_release_files (release):
                    'rec-48', 'rec-49', 'rec-50', 'rec-51', 'rec-master',
                    'dnsdist-17', 'dnsdist-18', 'dnsdist-19', 'dnsdist-master']:
         write_pkg_pin_file(release)
-        write_dockerfile('centos', '7', release)
+        write_dockerfile('el', '7', release)
         write_dockerfile('el', '8', release)
         write_dockerfile('el', '9', release)
         write_dockerfile('debian', 'buster', release)
@@ -241,7 +241,7 @@ def test_release (release, arch='x86_64'):
     returned_versions = []
     print('=== testing {} ({}) ==='.format(release, arch))
     for df in dockerfiles:
-        if arch == 'aarch64' and str(df).endswith('centos-7'):
+        if arch == 'aarch64' and str(df).endswith('el-7'):
             continue
         if arch == 'aarch64' and not release in ['rec-49', 'rec-50', 'rec-51', 'rec-master',
                                                  'dnsdist-19', 'dnsdist-master']:

diff --git a/build-scripts/docker/repo-test/templates/Dockerfile-centos.jinja2 b/build-scripts/docker/repo-test/templates/Dockerfile-centos.jinja2
deleted file mode 100644 (file)
index 69ea057..0000000
--- a/build-scripts/docker/repo-test/templates/Dockerfile-centos.jinja2
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM {{ os_image }}:{{ os_version }}
-
-RUN yum install -y epel-release bind-utils
-
-{% if os_version == '7' %}
-RUN yum install -y yum-plugin-priorities
-{% endif %}
-
-{% if release == 'dnsdist-15' and os_version == '8' %}
-RUN dnf install -y 'dnf-command(config-manager)'
-RUN dnf config-manager --set-enabled powertools
-{% endif %}
-
-RUN curl -o /etc/yum.repos.d/powerdns-{{ release }}.repo https://repo.powerdns.com/repo-files/{{ os }}-{{ release }}.repo
-RUN yum install --assumeyes {%- if os_version == '8' %} --nobest{% endif %} {{ pkg }}
-
-{% if release.startswith('rec-') %}
-RUN mkdir /var/run/pdns-recursor
-{% endif %}
-
-CMD {{ cmd }} --version
-

diff --git a/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2 b/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2
index 5e78b7b59b7103331b19c9d93c610967c53775b7..9dbabb84d9ac754957f309d8ad6b27143e477639 100644 (file)
--- a/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2
+++ b/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2
@@ -1,12 +1,6 @@
 FROM {{ os_image }}:{{ os_version }}
 
-{% if os_version == '8' or os_version == '9' %}
-RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ os_version }}.noarch.rpm bind-utils
-{% endif %}
-
-{% if os_version == '7' %}
-RUN yum install -y yum-plugin-priorities
-{% endif %}
+RUN yum install -y oracle-epel-release-el{{ os_version }} bind-utils
 
 {% if release == 'dnsdist-15' and os_version == '8' %}
 RUN dnf install -y 'dnf-command(config-manager)'