From 4714922163ede4c06d0ab779553d0e70df1e59f8 Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 3 May 2021 11:20:32 +0200
Subject: [PATCH] distro/tests: update fedora, ubuntu releases

fedora32 -> fedora 34
ubuntu2010 -> ubuntu2104
remove ubuntu1604
---
 .gitlab-ci.yml                                | 19 ++++--------
 .../tests/{fedora32 => fedora34}/Vagrantfile  |  4 +--
 .../tests/{fedora32 => fedora34}/ansible.cfg  |  0
 distro/tests/ubuntu1604/Vagrantfile           | 30 -------------------
 distro/tests/ubuntu2010/ansible.cfg           |  1 -
 .../{ubuntu2010 => ubuntu2104}/Vagrantfile    |  6 ++--
 .../{ubuntu1604 => ubuntu2104}/ansible.cfg    |  0
 7 files changed, 11 insertions(+), 49 deletions(-)
 rename distro/tests/{fedora32 => fedora34}/Vagrantfile (86%)
 rename distro/tests/{fedora32 => fedora34}/ansible.cfg (100%)
 delete mode 100644 distro/tests/ubuntu1604/Vagrantfile
 delete mode 120000 distro/tests/ubuntu2010/ansible.cfg
 rename distro/tests/{ubuntu2010 => ubuntu2104}/Vagrantfile (79%)
 rename distro/tests/{ubuntu1604 => ubuntu2104}/ansible.cfg (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea9d3fddc..95280dd0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -598,12 +598,12 @@ obs:fedora33:x86_64:
     DISTROTEST_NAME: fedora33
     DISTROTEST_REPO: Fedora_33
 
-obs:fedora32:x86_64:
+obs:fedora34:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: fedora32
-    DISTROTEST_REPO: Fedora_32
+    DISTROTEST_NAME: fedora34
+    DISTROTEST_REPO: Fedora_34
 
 obs:leap15:x86_64:
   <<: *distrotest
@@ -612,13 +612,6 @@ obs:leap15:x86_64:
     DISTROTEST_NAME: leap15
     DISTROTEST_REPO: openSUSE_Leap_15.2
 
-obs:ubuntu1604:x86_64:
-  <<: *distrotest
-  variables:
-    OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: ubuntu1604
-    DISTROTEST_REPO: xUbuntu_16.04
-
 obs:ubuntu1804:x86_64:
   <<: *distrotest
   variables:
@@ -637,12 +630,12 @@ obs:ubuntu2004:x86_64:
     DISTROTEST_NAME: ubuntu2004
     DISTROTEST_REPO: xUbuntu_20.04
 
-obs:ubuntu2010:x86_64:
+obs:ubuntu2104:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: ubuntu2010
-    DISTROTEST_REPO: xUbuntu_20.10
+    DISTROTEST_NAME: ubuntu2104
+    DISTROTEST_REPO: xUbuntu_21.04
 
 .packagingtest: &packagingtest
   stage: pkgtest
diff --git a/distro/tests/fedora32/Vagrantfile b/distro/tests/fedora34/Vagrantfile
similarity index 86%
rename from distro/tests/fedora32/Vagrantfile
rename to distro/tests/fedora34/Vagrantfile
index c784c6513..3203239e4 100644
--- a/distro/tests/fedora32/Vagrantfile
+++ b/distro/tests/fedora34/Vagrantfile
@@ -5,10 +5,10 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "fedora/32-cloud-base"
+    config.vm.box = "fedora/34-cloud-base"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "fedora32_knot-resolver"  do |machine|
+    config.vm.define "fedora34_knot-resolver"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-resolver-pkgtest.yaml"
             ansible.extra_vars = {
diff --git a/distro/tests/fedora32/ansible.cfg b/distro/tests/fedora34/ansible.cfg
similarity index 100%
rename from distro/tests/fedora32/ansible.cfg
rename to distro/tests/fedora34/ansible.cfg
diff --git a/distro/tests/ubuntu1604/Vagrantfile b/distro/tests/ubuntu1604/Vagrantfile
deleted file mode 100644
index 6d225013b..000000000
--- a/distro/tests/ubuntu1604/Vagrantfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-# -*- 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-resolver"  do |machine|
-        machine.vm.provision "ansible" do |ansible|
-            ansible.playbook = "../knot-resolver-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
diff --git a/distro/tests/ubuntu2010/ansible.cfg b/distro/tests/ubuntu2010/ansible.cfg
deleted file mode 120000
index f80698e88..000000000
--- a/distro/tests/ubuntu2010/ansible.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../.ansible.cfg
\ No newline at end of file
diff --git a/distro/tests/ubuntu2010/Vagrantfile b/distro/tests/ubuntu2104/Vagrantfile
similarity index 79%
rename from distro/tests/ubuntu2010/Vagrantfile
rename to distro/tests/ubuntu2104/Vagrantfile
index c9020a376..fef50758e 100644
--- a/distro/tests/ubuntu2010/Vagrantfile
+++ b/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-resolver"  do |machine|
+    config.vm.define "ubuntu2104_knot-resolver"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-resolver-pkgtest.yaml"
             ansible.extra_vars = {
diff --git a/distro/tests/ubuntu1604/ansible.cfg b/distro/tests/ubuntu2104/ansible.cfg
similarity index 100%
rename from distro/tests/ubuntu1604/ansible.cfg
rename to distro/tests/ubuntu2104/ansible.cfg
-- 
2.47.2