Merge branch 'ci-boxes' into 'master'

ci: update distrotests

See merge request !890

.gitlab-ci.yml

@@ -541,26 +541,26 @@ obs:debian10:x86_64:
     DISTROTEST_NAME: debian10
     DISTROTEST_REPO: Debian_10
 
-obs:fedora29:x86_64:
+obs:fedora30:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: fedora29
-    DISTROTEST_REPO: Fedora_29
+    DISTROTEST_NAME: fedora30
+    DISTROTEST_REPO: Fedora_30
 
-obs:fedora30:x86_64:
+obs:fedora31:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: fedora30
-    DISTROTEST_REPO: Fedora_30
+    DISTROTEST_NAME: fedora31
+    DISTROTEST_REPO: Fedora_31
 
 obs:leap15:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
     DISTROTEST_NAME: leap15
-    DISTROTEST_REPO: openSUSE_Leap_15.0
+    DISTROTEST_REPO: openSUSE_Leap_15.1
 
 obs:ubuntu1604:x86_64:
   <<: *distrotest
@@ -580,10 +580,10 @@ obs:ubuntu1804:x86_64:
     DISTROTEST_NAME: ubuntu1804
     DISTROTEST_REPO: xUbuntu_18.04
 
-obs:ubuntu1904:x86_64:
+obs:ubuntu1910:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: ubuntu1904
-    DISTROTEST_REPO: xUbuntu_19.04
+    DISTROTEST_NAME: ubuntu1910
+    DISTROTEST_REPO: xUbuntu_19.10
 # }}}

distro/tests/.ansible.cfg

@@ -3,3 +3,4 @@
 # additional paths to search for roles in, colon separated
 roles_path = ../ansible-roles
 interpreter_python = auto
+stdout_callback=debug

distro/tests/ansible-roles/obs_repos/tasks/openSUSE_Leap.yaml

 ---
+- name: Install python-xml dependency for zypper_repository
+  shell: zypper install -y python-xml
+  args:
+    warn: false
+
 - name: Add upstream repo(s)
   zypper_repository:
     repo: "{{ obs_repofile_url }}"

distro/tests/fedora29/Vagrantfile → distro/tests/fedora31/Vagrantfile

@@ -4,10 +4,10 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "fedora/29-cloud-base"
+    config.vm.box = "fedora/31-cloud-base"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "fedora29_knot-resolver"  do |machine|
+    config.vm.define "fedora31_knot-resolver"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-resolver-pkgtest.yaml"
             ansible.extra_vars = {

distro/tests/leap15/Vagrantfile

@@ -4,8 +4,7 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "openSUSE-Leap-15.1-Vagrant.x86_64"
-    config.vm.box_url = "https://download.opensuse.org/repositories/Virtualization:/Appliances:/Images:/openSUSE-Leap-15.1/images/boxes/openSUSE-Leap-15.1-Vagrant.x86_64.json"
+    config.vm.box = "generic/opensuse15"
 
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
@@ -18,6 +17,7 @@ Vagrant.configure(2) do |config|
     config.vm.provider :libvirt do |libvirt|
       libvirt.cpus = 1
       libvirt.memory = 1024
+      libvirt.disk_bus = "sata"
     end
 
     config.vm.provider :virtualbox do |vbox|

distro/tests/ubuntu1904/Vagrantfile → distro/tests/ubuntu1910/Vagrantfile

@@ -4,10 +4,11 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "generic/ubuntu1904"
+    # TODO: switch to generic/ubuntu1910 when available (has libvirt box)
+    config.vm.box = "ubuntu/eoan64"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "ubuntu1904_knot-resolver"  do |machine|
+    config.vm.define "ubuntu1910_knot-resolver"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-resolver-pkgtest.yaml"
             ansible.extra_vars = {

meson.build

@@ -16,7 +16,7 @@ endif
 
 
 message('--- required dependencies ---')
-knot_version = [ '>=2.8', '<3.0.0' ] # this would allow unreleased 3.0.dev
+knot_version = '>=2.8'
 libknot = dependency('libknot', version: knot_version)
 libdnssec = dependency('libdnssec', version: knot_version)
 libzscanner = dependency('libzscanner', version: knot_version)