From: Jakub Ružička <jakub.ruzicka@nic.cz>
Date: Thu, 5 Jan 2023 15:47:37 +0000 (+0100)
Subject: CI: update pkgtest for new apkg images
X-Git-Tag: v6.0.0a1~8^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b08efee5d4ae88aff12557ceaa2896cdc0115739;p=thirdparty%2Fknot-resolver.git

CI: update pkgtest for new apkg images

also:

* add Fedora 37, remove Fedora 35
* add AlmaLinux 9, remove Rocky 8 (image stopped working)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98925873f..958e64202 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -607,7 +607,7 @@ pkg:make-archive:
   # archive is created once and reused in other pkg jobs
   <<: *pkg_deb_extras
   stage: pkg
-  image: $CI_REGISTRY/packaging/apkg/lxc/debian-11
+  image: $CI_REGISTRY/packaging/apkg/full/debian-11
   tags:
     - lxc
     - amd64
@@ -621,29 +621,33 @@ pkg:make-archive:
 
 pkg:debian-11:
   <<: *pkg_test_deb
-  image: $CI_REGISTRY/packaging/apkg/lxc/debian-11
+  image: $CI_REGISTRY/packaging/apkg/full/debian-11
 
 pkg:ubuntu-22.04:
   <<: *pkg_test_deb
-  image: $CI_REGISTRY/packaging/apkg/lxc/ubuntu-22.04
+  image: $CI_REGISTRY/packaging/apkg/full/ubuntu-22.04
 
 pkg:ubuntu-20.04:
   <<: *pkg_test_deb
   <<: *enable_repo_build
-  image: $CI_REGISTRY/packaging/apkg/lxc/ubuntu-20.04
+  image: $CI_REGISTRY/packaging/apkg/full/ubuntu-20.04
+
+pkg:fedora-37:
+  <<: *pkg_test
+  image: $CI_REGISTRY/packaging/apkg/full/fedora-37
 
 pkg:fedora-36:
   <<: *pkg_test
-  image: $CI_REGISTRY/packaging/apkg/lxc/fedora-36
+  image: $CI_REGISTRY/packaging/apkg/full/fedora-36
 
-pkg:rocky-8:
+pkg:alma-9:
   <<: *pkg_test
-  image: $CI_REGISTRY/packaging/apkg/lxc/rocky-8
+  image: $CI_REGISTRY/packaging/apkg/full/alma-9
 
 pkg:opensuse-15.4:
   <<: *pkg_test
   <<: *enable_repo_build
-  image: $CI_REGISTRY/packaging/apkg/lxc/opensuse-15.4
+  image: $CI_REGISTRY/packaging/apkg/full/opensuse-15.4
   allow_failure: true  # SUSE is always special
 
 # }}}
diff --git a/manager/tests/packaging/control b/manager/tests/packaging/control
index 169552dc0..cda5a8fd4 100644
--- a/manager/tests/packaging/control
+++ b/manager/tests/packaging/control
@@ -18,11 +18,11 @@ Depends: knot-utils, jq, curl, procps
 Depends: knot-dnsutils, jq, curl, procps
 {% elif distro.match('arch') -%}
 Depends: knot, jq, curl
-{% elif distro.match('opensuse') -%}
-Depends: knot-utils, jq, curl
-{% elif distro.match('rocky') -%}
+{% elif distro.match('rocky', 'centos') -%}
 Depends: knot-utils, jq, curl
-{% elif distro.match('centos') -%}
+{% elif distro.match('almalinux') -%}
+Depends: knot-utils, jq, curl-minimal, procps
+{% elif distro.match('opensuse') -%}
 Depends: knot-utils, jq, curl
 {% else -%}
 Depends: unsupported-distro-this-package-does-not-exist-and-the-test-should-fail