From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 16 Aug 2022 07:46:29 +0000 (+0200)
Subject: ci OBS: replace Ubuntu 21.10 by 22.04
X-Git-Tag: v5.5.2^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fobs-knot-resolver-bs4hbr%2Fdeployments%2F2236;p=thirdparty%2Fknot-resolver.git

ci OBS: replace Ubuntu 21.10 by 22.04

21.10 isn't supported anymore, which is probably why it's failing.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0275510e1..071b33bfe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -722,12 +722,12 @@ obs:ubuntu2004:x86_64:
     DISTROTEST_NAME: ubuntu2004
     DISTROTEST_REPO: xUbuntu_20.04
 
-obs:ubuntu2110:x86_64:
+obs:ubuntu2204:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: ubuntu2110
-    DISTROTEST_REPO: xUbuntu_21.10
+    DISTROTEST_NAME: ubuntu2204
+    DISTROTEST_REPO: xUbuntu_22.04
 
 .packagingtest: &packagingtest
   stage: pkgtest
diff --git a/distro/tests/ubuntu2110/Vagrantfile b/distro/tests/ubuntu2204/Vagrantfile
similarity index 86%
rename from distro/tests/ubuntu2110/Vagrantfile
rename to distro/tests/ubuntu2204/Vagrantfile
index 441db2711..e2b97507a 100644
--- a/distro/tests/ubuntu2110/Vagrantfile
+++ b/distro/tests/ubuntu2204/Vagrantfile
@@ -5,10 +5,10 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "generic/ubuntu2110"
+    config.vm.box = "generic/ubuntu2204"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "ubuntu2110_knot-resolver"  do |machine|
+    config.vm.define "ubuntu2204_knot-resolver"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-resolver-pkgtest.yaml"
             ansible.extra_vars = {
diff --git a/distro/tests/ubuntu2110/ansible.cfg b/distro/tests/ubuntu2204/ansible.cfg
similarity index 100%
rename from distro/tests/ubuntu2110/ansible.cfg
rename to distro/tests/ubuntu2204/ansible.cfg