ci pkgtest: added more distros and removed old ones

diff --git a/ci/pkgtest.yaml b/ci/pkgtest.yaml
index 08a53dc34ec59755a8bbaf096a84531a7eacf680..a2a529f0aca5aa6aa76a03a52edd8163a47fab13 100644 (file)
--- a/ci/pkgtest.yaml
+++ b/ci/pkgtest.yaml
@@ -43,26 +43,6 @@ stages:
   - apt-get install -y python3-pip devscripts
   - *apkgbuild
 
-centos-7:pkgbuild:
-  <<: *pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/centos-7
-  before_script:
-    - export LC_ALL=en_US.UTF-8
-    - git config --global user.name CI
-    - git config --global user.email ci@nic
-  script:
-    - yum install -y rpm-build python3-pip epel-release
-    - *apkgbuild
-
-debian-9:pkgbuild:
-  <<: *pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/debian-9
-  variables:
-    OBS_REPO: knot-resolver-build
-    DISTROTEST_REPO: Debian_9.0
-  script:
-    - *debpkgbuild
-
 debian-10:pkgbuild:
   <<: *pkgbuild
   image: $CI_REGISTRY/labs/lxc-gitlab-runner/debian-10
@@ -81,16 +61,16 @@ debian-11:pkgbuild:
   script:
     - *debpkgbuild
 
-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
 
-fedora-35:pkgbuild:
+fedora-36:pkgbuild:
   <<: *pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-35
+  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-36
   script:
     - dnf install -y rpm-build python3-pip
     - *apkgbuild
@@ -119,15 +99,6 @@ rocky-8:pkgbuild:
     - dnf config-manager --set-enabled powertools
     - *apkgbuild
 
-ubuntu-18.04:pkgbuild:
-  <<: *pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/ubuntu-18.04
-  variables:
-    OBS_REPO: knot-resolver-build
-    DISTROTEST_REPO: xUbuntu_18.04
-  script:
-    - *debpkgbuild
-
 ubuntu-20.04:pkgbuild:
   <<: *pkgbuild
   image: $CI_REGISTRY/labs/lxc-gitlab-runner/ubuntu-20.04
@@ -146,6 +117,15 @@ ubuntu-21.10:pkgbuild:
   script:
     - *debpkgbuild
 
+ubuntu-22.04:pkgbuild:
+  <<: *pkgbuild
+  image: $CI_REGISTRY/labs/lxc-gitlab-runner/ubuntu-22.04
+  variables:
+    OBS_REPO: knot-resolver-build
+    DISTROTEST_REPO: xUbuntu_22.04
+  script:
+    - *debpkgbuild
+
 nixos-unstable:pkgbuild:
   <<: *pkgbuild
   # We do NOT use LXC, for now at least.
@@ -186,19 +166,6 @@ nixos-unstable:pkgbuild:
   - apt-get install -y python3-pip
   - *apkgtest
 
-centos-7:pkgtest:
-  <<: *pkgtest
-  needs:
-    - centos-7:pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/centos-7
-  before_script:
-    - export LC_ALL=en_US.UTF-8
-  script:
-    - yum install -y epel-release
-    - yum install -y findutils
-    - yum install -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module | grep -v debug | grep -v devel)
-    - *apkgtest
-
 debian-10:pkgtest:
   <<: *pkgtest
   needs:
@@ -221,27 +188,26 @@ debian-11:pkgtest:
   script:
     - *debpkgtest
 
-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 findutils python3-pip
     - dnf install -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module | grep -v debug | grep -v devel)
     - *apkgtest
 
-fedora-35:pkgtest:
+fedora-36:pkgtest:
   <<: *pkgtest
   needs:
-    - fedora-35:pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-35
+    - fedora-36:pkgbuild
+  image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-36
   script:
     - dnf install -y findutils python3-pip
     - dnf install -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module | grep -v debug | grep -v devel)
     - *apkgtest
     
-
 opensuse-15.2:pkgtest:
   <<: *pkgtest
   needs:
@@ -275,17 +241,6 @@ rocky-8:pkgtest:
     - dnf install -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module | grep -v debug | grep -v devel)
     - *apkgtest
 
-ubuntu-18.04:pkgtest:
-  <<: *pkgtest
-  needs:
-    - ubuntu-18.04:pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/ubuntu-18.04
-  variables:
-    OBS_REPO: knot-resolver-build
-    DISTROTEST_REPO: xUbuntu_18.04
-  script:
-    - *debpkgtest
-
 ubuntu-20.04:pkgtest:
   <<: *pkgtest
   needs:
@@ -307,4 +262,15 @@ ubuntu-21.10:pkgtest:
     DISTROTEST_REPO: xUbuntu_21.10
   script:
     - *debpkgtest
+
+ubuntu-22.04:pkgtest:
+  <<: *pkgtest
+  needs:
+    - ubuntu-22.04:pkgbuild
+  image: $CI_REGISTRY/labs/lxc-gitlab-runner/ubuntu-22.04
+  variables:
+    OBS_REPO: knot-resolver-build
+    DISTROTEST_REPO: xUbuntu_22.04
+  script:
+    - *debpkgtest
 # }}}