From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 16 Aug 2022 07:40:06 +0000 (+0200)
Subject: ci OBS: replace Fedora 34 by 36
X-Git-Tag: v5.5.2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34ba4b6dac97062b1f4cb7d72a8adb66d2019c46;p=thirdparty%2Fknot-resolver.git

ci OBS: replace Fedora 34 by 36

We've already done that on OBS side, which is probably why it's failing.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index baa09aca7..0275510e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -683,19 +683,19 @@ obs:debian11:x86_64:
     DISTROTEST_NAME: debian11
     DISTROTEST_REPO: Debian_11
 
-obs:fedora34:x86_64:
+obs:fedora35:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: fedora34
-    DISTROTEST_REPO: Fedora_34
+    DISTROTEST_NAME: fedora35
+    DISTROTEST_REPO: Fedora_35
 
-obs:fedora35:x86_64:
+obs:fedora36:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: fedora35
-    DISTROTEST_REPO: Fedora_35
+    DISTROTEST_NAME: fedora36
+    DISTROTEST_REPO: Fedora_36
 
 obs:leap15:x86_64:
   <<: *distrotest
diff --git a/distro/tests/fedora34/Vagrantfile b/distro/tests/fedora36/Vagrantfile
similarity index 86%
rename from distro/tests/fedora34/Vagrantfile
rename to distro/tests/fedora36/Vagrantfile
index 3203239e4..56659e59a 100644
--- a/distro/tests/fedora34/Vagrantfile
+++ b/distro/tests/fedora36/Vagrantfile
@@ -5,10 +5,10 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "fedora/34-cloud-base"
+    config.vm.box = "fedora/36-cloud-base"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "fedora34_knot-resolver"  do |machine|
+    config.vm.define "fedora36_knot-resolver"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-resolver-pkgtest.yaml"
             ansible.extra_vars = {
diff --git a/distro/tests/fedora34/ansible.cfg b/distro/tests/fedora36/ansible.cfg
similarity index 100%
rename from distro/tests/fedora34/ansible.cfg
rename to distro/tests/fedora36/ansible.cfg