From 8b435020d02980693f72a6814d05729056ca7ee3 Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 27 Jun 2019 15:06:51 +0200
Subject: [PATCH] distro/tests: separate ansible role for repo conf

---
 .../ansible-roles/knot_resolver/README.md     |  9 --------
 .../knot_resolver/defaults/main.yaml          |  1 -
 .../knot_resolver/files/Release.pub           | 21 -------------------
 .../tasks/configure_repos/Ubuntu.yaml         |  1 -
 .../configure_repos/openSUSE_Tumbleweed.yaml  |  1 -
 .../knot_resolver/tasks/main.yaml             |  3 ---
 .../knot_resolver/vars/CentOS.yaml            |  1 -
 .../knot_resolver/vars/Debian.yaml            |  1 -
 .../knot_resolver/vars/Fedora.yaml            |  1 -
 .../knot_resolver/vars/Ubuntu.yaml            |  1 -
 .../knot_resolver/vars/openSUSE_Leap.yaml     |  1 -
 .../vars/openSUSE_Tumbleweed.yaml             |  1 -
 .../obs_repos/defaults/main.yaml              |  3 +++
 .../tasks}/CentOS.yaml                        |  2 +-
 .../tasks}/Debian.yaml                        |  4 ++--
 .../tasks}/Fedora.yaml                        |  2 +-
 .../ansible-roles/obs_repos/tasks/Ubuntu.yaml | 13 ++++++++++++
 .../ansible-roles/obs_repos/tasks/main.yaml   |  6 ++++++
 .../tasks}/openSUSE_Leap.yaml                 |  2 +-
 .../obs_repos/tasks/openSUSE_Tumbleweed.yaml  | 12 +++++++++++
 .../ansible-roles/obs_repos/vars/CentOS.yaml  |  2 ++
 .../ansible-roles/obs_repos/vars/Debian.yaml  |  2 ++
 .../ansible-roles/obs_repos/vars/Fedora.yaml  |  2 ++
 .../ansible-roles/obs_repos/vars/Ubuntu.yaml  |  2 ++
 .../obs_repos/vars/openSUSE_Leap.yaml         |  2 ++
 .../obs_repos/vars/openSUSE_Tumbleweed.yaml   |  2 ++
 distro/tests/knot-resolver-pkgtest.yaml       |  1 +
 27 files changed, 52 insertions(+), 47 deletions(-)
 delete mode 100644 distro/tests/ansible-roles/knot_resolver/README.md
 delete mode 100644 distro/tests/ansible-roles/knot_resolver/files/Release.pub
 delete mode 120000 distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/Ubuntu.yaml
 delete mode 120000 distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/openSUSE_Tumbleweed.yaml
 create mode 100644 distro/tests/ansible-roles/obs_repos/defaults/main.yaml
 rename distro/tests/ansible-roles/{knot_resolver/tasks/configure_repos => obs_repos/tasks}/CentOS.yaml (85%)
 rename distro/tests/ansible-roles/{knot_resolver/tasks/configure_repos => obs_repos/tasks}/Debian.yaml (66%)
 rename distro/tests/ansible-roles/{knot_resolver/tasks/configure_repos => obs_repos/tasks}/Fedora.yaml (79%)
 create mode 100644 distro/tests/ansible-roles/obs_repos/tasks/Ubuntu.yaml
 create mode 100644 distro/tests/ansible-roles/obs_repos/tasks/main.yaml
 rename distro/tests/ansible-roles/{knot_resolver/tasks/configure_repos => obs_repos/tasks}/openSUSE_Leap.yaml (87%)
 create mode 100644 distro/tests/ansible-roles/obs_repos/tasks/openSUSE_Tumbleweed.yaml
 create mode 100644 distro/tests/ansible-roles/obs_repos/vars/CentOS.yaml
 create mode 100644 distro/tests/ansible-roles/obs_repos/vars/Debian.yaml
 create mode 100644 distro/tests/ansible-roles/obs_repos/vars/Fedora.yaml
 create mode 100644 distro/tests/ansible-roles/obs_repos/vars/Ubuntu.yaml
 create mode 100644 distro/tests/ansible-roles/obs_repos/vars/openSUSE_Leap.yaml
 create mode 100644 distro/tests/ansible-roles/obs_repos/vars/openSUSE_Tumbleweed.yaml

diff --git a/distro/tests/ansible-roles/knot_resolver/README.md b/distro/tests/ansible-roles/knot_resolver/README.md
deleted file mode 100644
index cce9cb638..000000000
--- a/distro/tests/ansible-roles/knot_resolver/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Knot Resolver testing role
-
-**WARNING**: This is for testing only, not currently suitable for production.
-
-Role which sets up Knot Resolver and performs checks it is running, including:
-
-- Setting up upstream repositories
-- Installing Knot Resolver
-- Perfoming basic tests
diff --git a/distro/tests/ansible-roles/knot_resolver/defaults/main.yaml b/distro/tests/ansible-roles/knot_resolver/defaults/main.yaml
index fc4c8ebdf..9a4024ca0 100644
--- a/distro/tests/ansible-roles/knot_resolver/defaults/main.yaml
+++ b/distro/tests/ansible-roles/knot_resolver/defaults/main.yaml
@@ -2,5 +2,4 @@
 repos:
   - knot-resolver-latest
 distro: "{{ ansible_distribution | replace(' ', '_') }}"
-repo_file_url: "https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/{{ obs_distro_name }}/home:CZ-NIC:{{ item }}.repo"
 update_packages: false
diff --git a/distro/tests/ansible-roles/knot_resolver/files/Release.pub b/distro/tests/ansible-roles/knot_resolver/files/Release.pub
deleted file mode 100644
index a35560431..000000000
--- a/distro/tests/ansible-roles/knot_resolver/files/Release.pub
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-mQENBFqFjysBCADWVYuSgTuduZNAUpq4w+X9EnBwDMibkJCZuNvjvwXNaFeWKOHf
-YEwcSFETOazApzjLxBj/eDTHtl0w0wvJUWsbTOEdJjue1X05X3nxQIiyXXIqjtzY
-OmMyJa2Y9zUWwdAj+miI81EaWN0aDSoa4LG+9cqlYIOO4jZnAQ3uVvCRypB9Lx6r
-2HGTSWaw77l3CHTPD0YVLbv90a5ChNsb3JMpiPhhK8F3pQxu8CfTz/0npEHxbRlK
-xWNIr773bhDonnGsapGPfrdy5afb/AxCiUuflKCrG0qg1l8M5OT4LxnnB8sqTXwH
-EFwHaWkwhiBG2hRG/Jco3k4sytnwr82VFKD1ABEBAAG0OGhvbWU6Q1otTklDIE9C
-UyBQcm9qZWN0IDxob21lOkNaLU5JQ0BidWlsZC5vcGVuc3VzZS5vcmc+iQE+BBMB
-CAAoBQJahY8rAhsDBQkEHrAABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRB0
-Bi2zah9ACWtKB/9CB5Ms/zC1kbYP6I7FrDi0KzfekQ/SrXq4acf/UrJwguVGniFs
-f/SevD7Knyvg9MBrVXguzE14oOpahJe0jHnDQCFe6S6mT7VybtylOUECx2f3zd2S
-MYQ96kzNQiP1yfaWi/bOi+ykpVZC7GYL9rMW2uzKisZSB64KT7Efd+0FQf57np0I
-ZnW54m62Oaf1ltX6Y0VNLhz8jOM4xK1EqxwMncj1/a+yB0+a8w1j8gR2yluQTfdG
-9QsUNU4VT86he5aYivVTJnY0XgqZYvXrqM0D0YfabjyGosc1zrnWwO5wVrGhcVYM
-obTkcAN+C2nm01R2ip2bjJ8fz8nYvYzNGkpniEYEExECAAYFAlqFjywACgkQOzAR
-t2udZSNgVACgiu9vroIHHXRMIx/w8JJrNEq/LaoAn2UVyQrPbspOV6mlToaKEa3r
-YheD
-=IUCb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/Ubuntu.yaml b/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/Ubuntu.yaml
deleted file mode 120000
index b4a655944..000000000
--- a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/Ubuntu.yaml
+++ /dev/null
@@ -1 +0,0 @@
-Debian.yaml
\ No newline at end of file
diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/openSUSE_Tumbleweed.yaml b/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/openSUSE_Tumbleweed.yaml
deleted file mode 120000
index 661aa2a24..000000000
--- a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/openSUSE_Tumbleweed.yaml
+++ /dev/null
@@ -1 +0,0 @@
-openSUSE_Leap.yaml
\ No newline at end of file
diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml b/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml
index 83db545c2..4de7e788c 100644
--- a/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml
+++ b/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml
@@ -2,9 +2,6 @@
 - name: Include distribution specific vars
   include_vars: "{{ distro }}.yaml"
 
-- name: Configure upstream reporitories
-  include: "configure_repos/{{ distro }}.yaml"
-
 - name: Update all packages
   package:
     name: '*'
diff --git a/distro/tests/ansible-roles/knot_resolver/vars/CentOS.yaml b/distro/tests/ansible-roles/knot_resolver/vars/CentOS.yaml
index c5d141c9a..d167a011e 100644
--- a/distro/tests/ansible-roles/knot_resolver/vars/CentOS.yaml
+++ b/distro/tests/ansible-roles/knot_resolver/vars/CentOS.yaml
@@ -1,5 +1,4 @@
 ---
-obs_distro_name: "{{ distro }}_{{ ansible_distribution_major_version }}_EPEL"
 show_package_version: rpm -qi knot-resolver | grep '^Version'
 packages:
   - knot-resolver
diff --git a/distro/tests/ansible-roles/knot_resolver/vars/Debian.yaml b/distro/tests/ansible-roles/knot_resolver/vars/Debian.yaml
index 45802bcb4..39747802f 100644
--- a/distro/tests/ansible-roles/knot_resolver/vars/Debian.yaml
+++ b/distro/tests/ansible-roles/knot_resolver/vars/Debian.yaml
@@ -1,5 +1,4 @@
 ---
-obs_distro_name: "{{ distro }}_9.0"
 show_package_version: dpkg -s knot-resolver | grep '^Version'
 packages:
   - knot-resolver
diff --git a/distro/tests/ansible-roles/knot_resolver/vars/Fedora.yaml b/distro/tests/ansible-roles/knot_resolver/vars/Fedora.yaml
index ff006f114..d167a011e 100644
--- a/distro/tests/ansible-roles/knot_resolver/vars/Fedora.yaml
+++ b/distro/tests/ansible-roles/knot_resolver/vars/Fedora.yaml
@@ -1,5 +1,4 @@
 ---
-obs_distro_name: "{{ distro }}_{{ ansible_distribution_major_version }}"
 show_package_version: rpm -qi knot-resolver | grep '^Version'
 packages:
   - knot-resolver
diff --git a/distro/tests/ansible-roles/knot_resolver/vars/Ubuntu.yaml b/distro/tests/ansible-roles/knot_resolver/vars/Ubuntu.yaml
index f332f83d6..39747802f 100644
--- a/distro/tests/ansible-roles/knot_resolver/vars/Ubuntu.yaml
+++ b/distro/tests/ansible-roles/knot_resolver/vars/Ubuntu.yaml
@@ -1,5 +1,4 @@
 ---
-obs_distro_name: "x{{ distro }}_{{ ansible_distribution_version }}"
 show_package_version: dpkg -s knot-resolver | grep '^Version'
 packages:
   - knot-resolver
diff --git a/distro/tests/ansible-roles/knot_resolver/vars/openSUSE_Leap.yaml b/distro/tests/ansible-roles/knot_resolver/vars/openSUSE_Leap.yaml
index 2239ef72d..d167a011e 100644
--- a/distro/tests/ansible-roles/knot_resolver/vars/openSUSE_Leap.yaml
+++ b/distro/tests/ansible-roles/knot_resolver/vars/openSUSE_Leap.yaml
@@ -1,5 +1,4 @@
 ---
-obs_distro_name: "{{ distro }}_15.0"
 show_package_version: rpm -qi knot-resolver | grep '^Version'
 packages:
   - knot-resolver
diff --git a/distro/tests/ansible-roles/knot_resolver/vars/openSUSE_Tumbleweed.yaml b/distro/tests/ansible-roles/knot_resolver/vars/openSUSE_Tumbleweed.yaml
index 0333b370e..11cffc361 100644
--- a/distro/tests/ansible-roles/knot_resolver/vars/openSUSE_Tumbleweed.yaml
+++ b/distro/tests/ansible-roles/knot_resolver/vars/openSUSE_Tumbleweed.yaml
@@ -1,5 +1,4 @@
 ---
-obs_distro_name: "{{ distro }}"
 show_package_version: rpm -qi knot-resolver | grep '^Version'
 update_packages: true
 packages:
diff --git a/distro/tests/ansible-roles/obs_repos/defaults/main.yaml b/distro/tests/ansible-roles/obs_repos/defaults/main.yaml
new file mode 100644
index 000000000..96c6b178a
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+obs_distro: "{{ ansible_distribution | replace(' ', '_') }}"
+obs_repofile_url: "https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/{{ obs_repo_version }}/home:CZ-NIC:{{ item }}.repo"
diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/CentOS.yaml b/distro/tests/ansible-roles/obs_repos/tasks/CentOS.yaml
similarity index 85%
rename from distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/CentOS.yaml
rename to distro/tests/ansible-roles/obs_repos/tasks/CentOS.yaml
index 779022dbe..6d603070c 100644
--- a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/CentOS.yaml
+++ b/distro/tests/ansible-roles/obs_repos/tasks/CentOS.yaml
@@ -6,6 +6,6 @@
 
 - name: Download repo file(s)
   get_url:
-    url: "{{ repo_file_url }}"
+    url: "{{ obs_repofile_url }}"
     dest: /etc/yum.repos.d/home:CZ-NIC:{{ item }}.repo
   with_items: "{{ repos }}"
diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/Debian.yaml b/distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml
similarity index 66%
rename from distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/Debian.yaml
rename to distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml
index c1c5ccf18..e7f4a0d1c 100644
--- a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/Debian.yaml
+++ b/distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml
@@ -1,13 +1,13 @@
 ---
 - name: Add upstream package signing key
   apt_key:
-    data: "{{ lookup('file', 'Release.pub') }}"
+    url: https://gitlab.labs.nic.cz/knot/knot-resolver-release/raw/master/cznic-obs.gpg.asc
     state: present
 
 - name: Add OBS repo(s)
   apt_repository:
     repo: >
-      deb http://download.opensuse.org/repositories/home:/CZ-NIC:/{{ item }}/{{ obs_distro_name }}/ /
+      deb http://download.opensuse.org/repositories/home:/CZ-NIC:/{{ item }}/{{ obs_repo_version }}/ /
     state: present
     update_cache: true
   with_items: "{{ repos }}"
diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/Fedora.yaml b/distro/tests/ansible-roles/obs_repos/tasks/Fedora.yaml
similarity index 79%
rename from distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/Fedora.yaml
rename to distro/tests/ansible-roles/obs_repos/tasks/Fedora.yaml
index 7e635f390..b004f36c0 100644
--- a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/Fedora.yaml
+++ b/distro/tests/ansible-roles/obs_repos/tasks/Fedora.yaml
@@ -1,6 +1,6 @@
 ---
 - name: Download repo file(s)
   get_url:
-    url: "{{ repo_file_url }}"
+    url: "{{ obs_repofile_url }}"
     dest: "/etc/yum.repos.d/home:CZ-NIC:{{ item }}.repo"
   with_items: "{{ repos }}"
diff --git a/distro/tests/ansible-roles/obs_repos/tasks/Ubuntu.yaml b/distro/tests/ansible-roles/obs_repos/tasks/Ubuntu.yaml
new file mode 100644
index 000000000..e7f4a0d1c
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/tasks/Ubuntu.yaml
@@ -0,0 +1,13 @@
+---
+- name: Add upstream package signing key
+  apt_key:
+    url: https://gitlab.labs.nic.cz/knot/knot-resolver-release/raw/master/cznic-obs.gpg.asc
+    state: present
+
+- name: Add OBS repo(s)
+  apt_repository:
+    repo: >
+      deb http://download.opensuse.org/repositories/home:/CZ-NIC:/{{ item }}/{{ obs_repo_version }}/ /
+    state: present
+    update_cache: true
+  with_items: "{{ repos }}"
diff --git a/distro/tests/ansible-roles/obs_repos/tasks/main.yaml b/distro/tests/ansible-roles/obs_repos/tasks/main.yaml
new file mode 100644
index 000000000..f7fb7cd06
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/tasks/main.yaml
@@ -0,0 +1,6 @@
+---
+- name: Include distribution specific vars
+  include_vars: "{{ obs_distro }}.yaml"
+
+- name: Configure upstream reporitories
+  include: "{{ obs_distro }}.yaml"
diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/openSUSE_Leap.yaml b/distro/tests/ansible-roles/obs_repos/tasks/openSUSE_Leap.yaml
similarity index 87%
rename from distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/openSUSE_Leap.yaml
rename to distro/tests/ansible-roles/obs_repos/tasks/openSUSE_Leap.yaml
index 474a97c9d..68b6f8d75 100644
--- a/distro/tests/ansible-roles/knot_resolver/tasks/configure_repos/openSUSE_Leap.yaml
+++ b/distro/tests/ansible-roles/obs_repos/tasks/openSUSE_Leap.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Add upstream repo(s)
   zypper_repository:
-    repo: "{{ repo_file_url}}"
+    repo: "{{ obs_repofile_url }}"
     state: present
     disable_gpg_check: true  # auto_import_keys is broken
   with_items: "{{ repos }}"
diff --git a/distro/tests/ansible-roles/obs_repos/tasks/openSUSE_Tumbleweed.yaml b/distro/tests/ansible-roles/obs_repos/tasks/openSUSE_Tumbleweed.yaml
new file mode 100644
index 000000000..68b6f8d75
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/tasks/openSUSE_Tumbleweed.yaml
@@ -0,0 +1,12 @@
+---
+- name: Add upstream repo(s)
+  zypper_repository:
+    repo: "{{ obs_repofile_url }}"
+    state: present
+    disable_gpg_check: true  # auto_import_keys is broken
+  with_items: "{{ repos }}"
+
+- name: Refresh all repositories
+  zypper_repository:
+    repo: '*'
+    runrefresh: true
diff --git a/distro/tests/ansible-roles/obs_repos/vars/CentOS.yaml b/distro/tests/ansible-roles/obs_repos/vars/CentOS.yaml
new file mode 100644
index 000000000..bc753749c
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/vars/CentOS.yaml
@@ -0,0 +1,2 @@
+---
+obs_repo_version: "{{ obs_distro }}_{{ ansible_distribution_major_version }}_EPEL"
diff --git a/distro/tests/ansible-roles/obs_repos/vars/Debian.yaml b/distro/tests/ansible-roles/obs_repos/vars/Debian.yaml
new file mode 100644
index 000000000..085f12683
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/vars/Debian.yaml
@@ -0,0 +1,2 @@
+---
+obs_repo_version: "{{ obs_distro }}_{{ ansible_distribution_major_version }}.0"
diff --git a/distro/tests/ansible-roles/obs_repos/vars/Fedora.yaml b/distro/tests/ansible-roles/obs_repos/vars/Fedora.yaml
new file mode 100644
index 000000000..bbe23e468
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/vars/Fedora.yaml
@@ -0,0 +1,2 @@
+---
+obs_repo_version: "{{ obs_distro }}_{{ ansible_distribution_major_version }}"
diff --git a/distro/tests/ansible-roles/obs_repos/vars/Ubuntu.yaml b/distro/tests/ansible-roles/obs_repos/vars/Ubuntu.yaml
new file mode 100644
index 000000000..93e92b017
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/vars/Ubuntu.yaml
@@ -0,0 +1,2 @@
+---
+obs_repo_version: "x{{ obs_distro }}_{{ ansible_distribution_version }}"
diff --git a/distro/tests/ansible-roles/obs_repos/vars/openSUSE_Leap.yaml b/distro/tests/ansible-roles/obs_repos/vars/openSUSE_Leap.yaml
new file mode 100644
index 000000000..fc650ccf8
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/vars/openSUSE_Leap.yaml
@@ -0,0 +1,2 @@
+---
+obs_repo_version: "{{ obs_distro }}_{{ ansible_distribution_version }}"
diff --git a/distro/tests/ansible-roles/obs_repos/vars/openSUSE_Tumbleweed.yaml b/distro/tests/ansible-roles/obs_repos/vars/openSUSE_Tumbleweed.yaml
new file mode 100644
index 000000000..ad6a13dff
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/vars/openSUSE_Tumbleweed.yaml
@@ -0,0 +1,2 @@
+---
+obs_repo_version: "{{ obs_distro }}"
diff --git a/distro/tests/knot-resolver-pkgtest.yaml b/distro/tests/knot-resolver-pkgtest.yaml
index e68fa95a5..419fef423 100644
--- a/distro/tests/knot-resolver-pkgtest.yaml
+++ b/distro/tests/knot-resolver-pkgtest.yaml
@@ -8,4 +8,5 @@
     - repos.yaml
 
   roles:
+    - obs_repos
     - knot_resolver
-- 
2.47.2