From ae8bbc6642e5730ff119c7391cadd4e3499b993d Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 7 Mar 2022 10:25:44 +0100 Subject: [PATCH] distro/tests: add Rocky support --- .../ansible-roles/knot_resolver/tasks/main.yaml | 6 +++--- .../ansible-roles/knot_resolver/vars/Rocky.yaml | 6 ++++++ .../tests/ansible-roles/obs_repos/tasks/Rocky.yaml | 13 +++++++++++++ .../tests/ansible-roles/obs_repos/vars/Rocky.yaml | 3 +++ 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 distro/tests/ansible-roles/knot_resolver/vars/Rocky.yaml create mode 100644 distro/tests/ansible-roles/obs_repos/tasks/Rocky.yaml create mode 100644 distro/tests/ansible-roles/obs_repos/vars/Rocky.yaml diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml b/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml index a8ce8dd76..8d683c809 100644 --- a/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml +++ b/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml @@ -42,11 +42,11 @@ state: latest - include: configure_doh.yaml - when: ansible_distribution in ["CentOS", "Fedora", "Debian", "Ubuntu"] + when: ansible_distribution in ["CentOS", "Rocky", "Fedora", "Debian", "Ubuntu"] - include: restart_kresd.yaml - include: test_doh.yaml - when: distro in ["Fedora", "Debian", "CentOS"] or (distro == "Ubuntu" and ansible_distribution_major_version|int >= 18) + when: distro in ["Fedora", "Debian", "CentOS", "Rocky"] or (distro == "Ubuntu" and ansible_distribution_major_version|int >= 18) - name: Test dnstap module block: @@ -56,7 +56,7 @@ state: latest - include: configure_dnstap.yaml - include: restart_kresd.yaml - when: distro in ["Fedora", "Debian", "CentOS", "Ubuntu"] + when: distro in ["Fedora", "Debian", "CentOS", "Rocky", "Ubuntu"] always: diff --git a/distro/tests/ansible-roles/knot_resolver/vars/Rocky.yaml b/distro/tests/ansible-roles/knot_resolver/vars/Rocky.yaml new file mode 100644 index 000000000..d69cb13de --- /dev/null +++ b/distro/tests/ansible-roles/knot_resolver/vars/Rocky.yaml @@ -0,0 +1,6 @@ +--- +# SPDX-License-Identifier: GPL-3.0-or-later +show_package_version: rpm -qi knot-resolver | grep '^Version' +packages: + - knot-resolver + - knot-utils diff --git a/distro/tests/ansible-roles/obs_repos/tasks/Rocky.yaml b/distro/tests/ansible-roles/obs_repos/tasks/Rocky.yaml new file mode 100644 index 000000000..fecfbeaaf --- /dev/null +++ b/distro/tests/ansible-roles/obs_repos/tasks/Rocky.yaml @@ -0,0 +1,13 @@ +--- +# SPDX-License-Identifier: GPL-3.0-or-later +- name: Install EPEL + yum: + name: epel-release + state: present + +- name: Download repo file(s) + get_url: + url: "{{ obs_repofile_url }}" + dest: /etc/yum.repos.d/home:CZ-NIC:{{ item }}.repo + mode: 0644 + with_items: "{{ repos }}" diff --git a/distro/tests/ansible-roles/obs_repos/vars/Rocky.yaml b/distro/tests/ansible-roles/obs_repos/vars/Rocky.yaml new file mode 100644 index 000000000..b8b527446 --- /dev/null +++ b/distro/tests/ansible-roles/obs_repos/vars/Rocky.yaml @@ -0,0 +1,3 @@ +--- +# SPDX-License-Identifier: GPL-3.0-or-later +obs_repo_version: "CentOS_{{ ansible_distribution_major_version }}_EPEL" -- 2.47.2