From 07325ec22266b299ea0b25abebe0f05fd1446857 Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 20 Jan 2022 17:11:36 +0100
Subject: [PATCH] WIP: ci: use new packaging containers

---
 ci/pkgtest.yaml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/ci/pkgtest.yaml b/ci/pkgtest.yaml
index 73f666afe..3900c8b5b 100644
--- a/ci/pkgtest.yaml
+++ b/ci/pkgtest.yaml
@@ -11,7 +11,7 @@ stages:
   before_script:
     - git config --global user.name CI
     - git config --global user.email ci@nic
-  needs: # https://gitlab.nic.cz/help/ci/yaml/README.md#artifact-downloads-to-child-pipelines
+  needs:
     - pipeline: $PARENT_PIPELINE_ID
       job: archive
   artifacts:
@@ -68,12 +68,10 @@ debian-10:pkgbuild:
 
 debian-11:pkgbuild:
   <<: *pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/debian-11
-  variables:
-    OBS_REPO: knot-resolver-build
-    DISTROTEST_REPO: Debian_11
+  image: $CI_REGISTRY/knot/knot-resolver/ci/pkg-debian-11:knot-$KNOT_VERSION
   script:
-    - *debpkgbuild
+    - apt-get update  # TODO: decide whether to change image / handle in apkg
+    - apkg build --build-dep
 
 fedora-34:pkgbuild:
   <<: *pkgbuild
@@ -215,12 +213,11 @@ debian-11:pkgtest:
   <<: *pkgtest
   needs:
     - debian-11:pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/debian-11
-  variables:
-    OBS_REPO: knot-resolver-build
-    DISTROTEST_REPO: Debian_11
+  image: $CI_REGISTRY/knot/knot-resolver/ci/pkg-debian-11:knot-3.1
   script:
-    - *debpkgtest
+    - apkg install
+    - systemctl start kresd@1
+    - kdig @127.0.0.1 nic.cz | grep -qi NOERROR
 
 fedora-34:pkgtest:
   <<: *pkgtest
-- 
2.47.2