distro/tests: update distributions

- update fedora to 33
- update ubuntu rolling to groovy

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c20c1f5e0e1b74e5e74a50fea9bb04ba9c0dae52..443603776ba2efaca55f89ddd681b2635343e2af 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -553,12 +553,12 @@ obs:debian10:x86_64:
     DISTROTEST_NAME: debian10
     DISTROTEST_REPO: Debian_10
 
-obs:fedora31:x86_64:
+obs:fedora33:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: fedora31
-    DISTROTEST_REPO: Fedora_31
+    DISTROTEST_NAME: fedora33
+    DISTROTEST_REPO: Fedora_33
 
 obs:fedora32:x86_64:
   <<: *distrotest
@@ -592,19 +592,19 @@ obs:ubuntu1804:x86_64:
     DISTROTEST_NAME: ubuntu1804
     DISTROTEST_REPO: xUbuntu_18.04
 
-obs:ubuntu1910:x86_64:
+obs:ubuntu2004:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: ubuntu1910
-    DISTROTEST_REPO: xUbuntu_19.10
+    DISTROTEST_NAME: ubuntu2004
+    DISTROTEST_REPO: xUbuntu_20.04
 
-obs:ubuntu2004:x86_64:
+obs:ubuntu2010:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: ubuntu2004
-    DISTROTEST_REPO: xUbuntu_20.04
+    DISTROTEST_NAME: ubuntu2010
+    DISTROTEST_REPO: xUbuntu_20.10
 
 .packagingtest: &packagingtest
   stage: pkgtest

diff --git a/distro/tests/fedora31/Vagrantfile b/distro/tests/fedora33/Vagrantfile
similarity index 86%
rename from distro/tests/fedora31/Vagrantfile
rename to distro/tests/fedora33/Vagrantfile
index 5e3a0caba6599f6ae1fb5ef2f8bb5f46d1eb3ce9..7971439005448234f702fb281db1618d0a10b132 100644 (file)
--- a/distro/tests/fedora31/Vagrantfile
+++ b/distro/tests/fedora33/Vagrantfile
@@ -5,10 +5,10 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "fedora/31-cloud-base"
+    config.vm.box = "fedora/33-cloud-base"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "fedora31_knot-resolver"  do |machine|
+    config.vm.define "fedora33_knot-resolver"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-resolver-pkgtest.yaml"
             ansible.extra_vars = {

diff --git a/distro/tests/fedora31/ansible.cfg b/distro/tests/fedora33/ansible.cfg
similarity index 100%
rename from distro/tests/fedora31/ansible.cfg
rename to distro/tests/fedora33/ansible.cfg

diff --git a/distro/tests/ubuntu1910/Vagrantfile b/distro/tests/ubuntu2010/Vagrantfile
similarity index 79%
rename from distro/tests/ubuntu1910/Vagrantfile
rename to distro/tests/ubuntu2010/Vagrantfile
index 5f8740aa074357b3f86006dbc83b9f475f197bcf..c9020a3762aa567ba37c852f44775fc0f1b750c6 100644 (file)
--- a/distro/tests/ubuntu1910/Vagrantfile
+++ b/distro/tests/ubuntu2010/Vagrantfile
@@ -5,11 +5,11 @@
 
 Vagrant.configure(2) do |config|
 
-    # TODO: switch to generic/ubuntu1910 when available (has libvirt box)
-    config.vm.box = "ubuntu/eoan64"
+    # TODO: switch to generic/ubuntu2010 when available (has libvirt box)
+    config.vm.box = "ubuntu/groovy64"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "ubuntu1910_knot-resolver"  do |machine|
+    config.vm.define "ubuntu2010_knot-resolver"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-resolver-pkgtest.yaml"
             ansible.extra_vars = {

diff --git a/distro/tests/ubuntu1910/ansible.cfg b/distro/tests/ubuntu2010/ansible.cfg
similarity index 100%
rename from distro/tests/ubuntu1910/ansible.cfg
rename to distro/tests/ubuntu2010/ansible.cfg