From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 30 Oct 2020 15:30:38 +0000 (+0100)
Subject: distro/tests: update distributions
X-Git-Tag: v5.2.0~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d1f6f4f93623c8af9a45d42daa65bcd115d59fd;p=thirdparty%2Fknot-resolver.git

distro/tests: update distributions

- update fedora to 33
- update ubuntu rolling to groovy
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c20c1f5e0..443603776 100644
--- 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 5e3a0caba..797143900 100644
--- 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 5f8740aa0..c9020a376 100644
--- 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