From 012efc02a26c5ffeac6baaca346f6083679dc136 Mon Sep 17 00:00:00 2001 From: aerique Date: Wed, 2 Nov 2022 14:42:10 +0100 Subject: [PATCH] Add dnsdist-17 for Ubuntu Jammy and EL-9 to repo test script (#12153) * Add dnsdist-17 for EL9 and Ubuntu Jammy to repo test script. * Fix issue with EPEL for EL9 in repo test script. --- build-scripts/docker/repo-test/generate-repo-files.py | 5 +++-- .../docker/repo-test/templates/Dockerfile-el.jinja2 | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build-scripts/docker/repo-test/generate-repo-files.py b/build-scripts/docker/repo-test/generate-repo-files.py index a0e16db509..f8f806dbba 100755 --- a/build-scripts/docker/repo-test/generate-repo-files.py +++ b/build-scripts/docker/repo-test/generate-repo-files.py @@ -168,12 +168,13 @@ def write_release_files (release): if release in ['auth-46', 'auth-47', 'auth-master', 'rec-46', 'rec-47', 'rec-48', 'rec-master', - 'dnsdist-master']: + 'dnsdist-17', 'dnsdist-master']: write_dockerfile('ubuntu', 'jammy', release) write_list_file('ubuntu', 'jammy', release) if release in ['auth-47', 'auth-master', - 'rec-47', 'rec-48', 'rec-master']: + 'rec-47', 'rec-48', 'rec-master', + 'dnsdist-17', 'dnsdist-master']: write_dockerfile('el', '9', release) # Test Release Functions diff --git a/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2 b/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2 index 5e7254fad7..5e78b7b59b 100644 --- a/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2 +++ b/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2 @@ -1,6 +1,8 @@ FROM {{ os_image }}:{{ os_version }} -RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm bind-utils +{% 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 -- 2.47.2