From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 8 Nov 2021 15:07:26 +0000 (+0100)
Subject: ci/distrotests: add fedora35, ubuntu2110
X-Git-Tag: v5.4.3~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e3e6dd32222fd0f43149120c7fdd133c358ae27;p=thirdparty%2Fknot-resolver.git

ci/distrotests: add fedora35, ubuntu2110
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ccedbc12..cb0700ac1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -639,19 +639,19 @@ obs:debian11:x86_64:
     DISTROTEST_NAME: debian11
     DISTROTEST_REPO: Debian_11
 
-obs:fedora33:x86_64:
+obs:fedora34:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: fedora33
-    DISTROTEST_REPO: Fedora_33
+    DISTROTEST_NAME: fedora34
+    DISTROTEST_REPO: Fedora_34
 
-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:leap15:x86_64:
   <<: *distrotest
@@ -678,12 +678,12 @@ obs:ubuntu2004:x86_64:
     DISTROTEST_NAME: ubuntu2004
     DISTROTEST_REPO: xUbuntu_20.04
 
-obs:ubuntu2104:x86_64:
+obs:ubuntu2110:x86_64:
   <<: *distrotest
   variables:
     OBS_REPO: knot-resolver-latest
-    DISTROTEST_NAME: ubuntu2104
-    DISTROTEST_REPO: xUbuntu_21.04
+    DISTROTEST_NAME: ubuntu2110
+    DISTROTEST_REPO: xUbuntu_21.10
 
 .packagingtest: &packagingtest
   stage: pkgtest
diff --git a/ci/pkgtest.yaml b/ci/pkgtest.yaml
index 3854a3da3..6efcc0271 100644
--- a/ci/pkgtest.yaml
+++ b/ci/pkgtest.yaml
@@ -75,16 +75,16 @@ debian-11:pkgbuild:
   script:
     - *debpkgbuild
 
-fedora-33:pkgbuild:
+fedora-34:pkgbuild:
   <<: *pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-33
+  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-34
   script:
     - dnf install -y rpm-build python3-pip
     - *apkgbuild
 
-fedora-34:pkgbuild:
+fedora-35:pkgbuild:
   <<: *pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-34
+  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-35
   script:
     - dnf install -y rpm-build python3-pip
     - *apkgbuild
@@ -131,12 +131,12 @@ ubuntu-20.04:pkgbuild:
   script:
     - *debpkgbuild
 
-ubuntu-21.04:pkgbuild:
+ubuntu-21.10:pkgbuild:
   <<: *pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/ubuntu-21.04
+  image: $CI_REGISTRY/labs/lxc-gitlab-runner/ubuntu-21.10
   variables:
     OBS_REPO: knot-resolver-build
-    DISTROTEST_REPO: xUbuntu_21.04
+    DISTROTEST_REPO: xUbuntu_21.10
   script:
     - *debpkgbuild
 
@@ -221,22 +221,22 @@ debian-11:pkgtest:
   script:
     - *debpkgtest
 
-fedora-33:pkgtest:
+fedora-34:pkgtest:
   <<: *pkgtest
   needs:
-    - fedora-33:pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-33
+    - fedora-34:pkgbuild
+  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-34
   script:
     - dnf install -y knot-utils findutils
     - dnf install -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module | grep -v debug | grep -v devel)
     - systemctl start kresd@1
     - kdig @127.0.0.1 nic.cz | grep -qi NOERROR
 
-fedora-34:pkgtest:
+fedora-35:pkgtest:
   <<: *pkgtest
   needs:
-    - fedora-34:pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-34
+    - fedora-35:pkgbuild
+  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-35
   script:
     - dnf install -y knot-utils findutils
     - dnf install -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module | grep -v debug | grep -v devel)
@@ -301,14 +301,14 @@ ubuntu-20.04:pkgtest:
   script:
     - *debpkgtest
 
-ubuntu-21.04:pkgtest:
+ubuntu-21.10:pkgtest:
   <<: *pkgtest
   needs:
-    - ubuntu-21.04:pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/ubuntu-21.04
+    - ubuntu-21.10:pkgbuild
+  image: $CI_REGISTRY/labs/lxc-gitlab-runner/ubuntu-21.10
   variables:
     OBS_REPO: knot-resolver-build
-    DISTROTEST_REPO: xUbuntu_21.04
+    DISTROTEST_REPO: xUbuntu_21.10
   script:
     - *debpkgtest
 # }}}
diff --git a/distro/tests/fedora33/Vagrantfile b/distro/tests/fedora35/Vagrantfile
similarity index 86%
rename from distro/tests/fedora33/Vagrantfile
rename to distro/tests/fedora35/Vagrantfile
index 797143900..1fe18eccf 100644
--- a/distro/tests/fedora33/Vagrantfile
+++ b/distro/tests/fedora35/Vagrantfile
@@ -5,10 +5,10 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "fedora/33-cloud-base"
+    config.vm.box = "fedora/35-cloud-base"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "fedora33_knot-resolver"  do |machine|
+    config.vm.define "fedora35_knot-resolver"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-resolver-pkgtest.yaml"
             ansible.extra_vars = {
diff --git a/distro/tests/fedora33/ansible.cfg b/distro/tests/fedora35/ansible.cfg
similarity index 100%
rename from distro/tests/fedora33/ansible.cfg
rename to distro/tests/fedora35/ansible.cfg
diff --git a/distro/tests/ubuntu2104/Vagrantfile b/distro/tests/ubuntu2110/Vagrantfile
similarity index 78%
rename from distro/tests/ubuntu2104/Vagrantfile
rename to distro/tests/ubuntu2110/Vagrantfile
index fef50758e..441db2711 100644
--- a/distro/tests/ubuntu2104/Vagrantfile
+++ b/distro/tests/ubuntu2110/Vagrantfile
@@ -5,11 +5,10 @@
 
 Vagrant.configure(2) do |config|
 
-    # TODO: switch to generic/ubuntu2104 when available (has libvirt box)
-    config.vm.box = "ubuntu/hirsute64"
+    config.vm.box = "generic/ubuntu2110"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "ubuntu2104_knot-resolver"  do |machine|
+    config.vm.define "ubuntu2110_knot-resolver"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-resolver-pkgtest.yaml"
             ansible.extra_vars = {
diff --git a/distro/tests/ubuntu2104/ansible.cfg b/distro/tests/ubuntu2110/ansible.cfg
similarity index 100%
rename from distro/tests/ubuntu2104/ansible.cfg
rename to distro/tests/ubuntu2110/ansible.cfg