From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 18 Jul 2019 13:48:58 +0000 (+0200)
Subject: ci: add distrotest:debian10
X-Git-Tag: v4.2.0~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89a9980b3ee72e4bda62025bbed912ac7a47a4c2;p=thirdparty%2Fknot-resolver.git

ci: add distrotest:debian10
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e59e5220..943a16c50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -560,6 +560,12 @@ obs:debian9:x86_64:
     DISTROTEST_NAME: debian9
     DISTROTEST_REPO: Debian_9.0
 
+obs:debian10:x86_64:
+  <<: *distrotest
+  variables:
+    DISTROTEST_NAME: debian10
+    DISTROTEST_REPO: Debian_10
+
 obs:fedora29:x86_64:
   <<: *distrotest
   variables:
diff --git a/distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml b/distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml
index e7f4a0d1c..88782b767 100644
--- a/distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml
+++ b/distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml
@@ -1,8 +1,8 @@
 ---
 - name: Add upstream package signing key
-  apt_key:
+  get_url:
     url: https://gitlab.labs.nic.cz/knot/knot-resolver-release/raw/master/cznic-obs.gpg.asc
-    state: present
+    dest: /etc/apt/trusted.gpg.d/cznic-obs.gpg.asc
 
 - name: Add OBS repo(s)
   apt_repository:
diff --git a/distro/tests/ansible-roles/obs_repos/tasks/main.yaml b/distro/tests/ansible-roles/obs_repos/tasks/main.yaml
index f7fb7cd06..4f17e874d 100644
--- a/distro/tests/ansible-roles/obs_repos/tasks/main.yaml
+++ b/distro/tests/ansible-roles/obs_repos/tasks/main.yaml
@@ -1,6 +1,11 @@
 ---
+- name: Include Debian specific vars
+  include_vars: "{{ obs_distro }}_{{ ansible_distribution_major_version }}.yaml"
+  when: obs_distro == "Debian"
+
 - name: Include distribution specific vars
   include_vars: "{{ obs_distro }}.yaml"
+  when: obs_distro != "Debian"
 
 - name: Configure upstream reporitories
   include: "{{ obs_distro }}.yaml"
diff --git a/distro/tests/ansible-roles/obs_repos/vars/Debian_10.yaml b/distro/tests/ansible-roles/obs_repos/vars/Debian_10.yaml
new file mode 100644
index 000000000..bbe23e468
--- /dev/null
+++ b/distro/tests/ansible-roles/obs_repos/vars/Debian_10.yaml
@@ -0,0 +1,2 @@
+---
+obs_repo_version: "{{ obs_distro }}_{{ ansible_distribution_major_version }}"
diff --git a/distro/tests/ansible-roles/obs_repos/vars/Debian.yaml b/distro/tests/ansible-roles/obs_repos/vars/Debian_9.yaml
similarity index 100%
rename from distro/tests/ansible-roles/obs_repos/vars/Debian.yaml
rename to distro/tests/ansible-roles/obs_repos/vars/Debian_9.yaml
diff --git a/distro/tests/debian10/Vagrantfile b/distro/tests/debian10/Vagrantfile
new file mode 100644
index 000000000..7d52e479f
--- /dev/null
+++ b/distro/tests/debian10/Vagrantfile
@@ -0,0 +1,27 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+
+Vagrant.configure(2) do |config|
+
+    # debian/buster64 requires manual intervention for apt update as of 2019-07-18
+    config.vm.box = "generic/debian10"
+    config.vm.synced_folder ".", "/vagrant", disabled: true
+
+    config.vm.define "debian10_knot-resolver"  do |machine|
+        machine.vm.provision "ansible" do |ansible|
+            ansible.playbook = "../knot-resolver-pkgtest.yaml"
+        end
+    end
+
+    config.vm.provider :libvirt do |libvirt|
+      libvirt.cpus = 1
+      libvirt.memory = 1024
+    end
+
+    config.vm.provider :virtualbox do |vbox|
+      vbox.cpus = 1
+      vbox.memory = 1024
+    end
+
+end
diff --git a/distro/tests/debian10/ansible.cfg b/distro/tests/debian10/ansible.cfg
new file mode 120000
index 000000000..f80698e88
--- /dev/null
+++ b/distro/tests/debian10/ansible.cfg
@@ -0,0 +1 @@
+../.ansible.cfg
\ No newline at end of file