Merge branch 'ci-distro-update' into 'master'

distro/tests: update fedora, ubuntu releases

See merge request !1286

.gitlab-ci.yml

@@ -397,11 +397,11 @@ obs:debian10:x86_64:
     DISTROTEST_NAME: debian10
     DISTROTEST_REPO: Debian_10
 
-obs:fedora32:x86_64:
+obs:fedora34:x86_64:
   <<: *distrotest
   variables:
-    DISTROTEST_NAME: fedora32
-    DISTROTEST_REPO: Fedora_32
+    DISTROTEST_NAME: fedora34
+    DISTROTEST_REPO: Fedora_34
 
 obs:fedora33:x86_64:
   <<: *distrotest
@@ -415,12 +415,6 @@ obs:leap15:x86_64:
     DISTROTEST_NAME: leap15
     DISTROTEST_REPO: openSUSE_Leap_15.2
 
-obs:ubuntu1604:x86_64:
-  <<: *distrotest
-  variables:
-    DISTROTEST_NAME: ubuntu1604
-    DISTROTEST_REPO: xUbuntu_16.04
-
 obs:ubuntu1804:x86_64:
   <<: *distrotest
   variables:
@@ -433,8 +427,8 @@ obs:ubuntu2004:x86_64:
     DISTROTEST_NAME: ubuntu2004
     DISTROTEST_REPO: xUbuntu_20.04
 
-obs:ubuntu2010:x86_64:
+obs:ubuntu2104:x86_64:
   <<: *distrotest
   variables:
-    DISTROTEST_NAME: ubuntu2010
-    DISTROTEST_REPO: xUbuntu_20.10
+    DISTROTEST_NAME: ubuntu2104
+    DISTROTEST_REPO: xUbuntu_21.04

distro/tests/ubuntu1604/Vagrantfile

-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-
-Vagrant.configure(2) do |config|
-
-    config.vm.box = "generic/ubuntu1604"
-    config.vm.synced_folder ".", "/vagrant", disabled: true
-
-    config.vm.define "ubuntu1604_knot-dns"  do |machine|
-        machine.vm.provision "ansible" do |ansible|
-            ansible.playbook = "../knot-dns-pkgtest.yaml"
-            ansible.extra_vars = {
-                ansible_python_interpreter: "/usr/bin/python3"
-            }
-        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

distro/tests/ubuntu2010/ansible.cfg

-../.ansible.cfg
\ No newline at end of file

distro/tests/ubuntu2010/Vagrantfile → distro/tests/ubuntu2104/Vagrantfile

@@ -5,11 +5,11 @@
 
 Vagrant.configure(2) do |config|
 
-    # TODO: switch to generic/ubuntu2010 when available (has libvirt box)
-    config.vm.box = "ubuntu/groovy64"
+    # TODO: switch to generic/ubuntu2104 when available (has libvirt box)
+    config.vm.box = "ubuntu/hirsute64"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "ubuntu2010_knot-dns"  do |machine|
+    config.vm.define "ubuntu2104_knot-dns"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-dns-pkgtest.yaml"
             ansible.extra_vars = {