From: Jakub Ružička <jakub.ruzicka@nic.cz>
Date: Fri, 30 Sep 2022 15:35:22 +0000 (+0200)
Subject: CI: don't (re)install apkg
X-Git-Tag: v6.0.0a1~22^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=948d3e7b99c2db0799ffbd56a4ac75a3086272b7;p=thirdparty%2Fknot-resolver.git

CI: don't (re)install apkg

apkg is already installed in apkg LXC images, no need to install it here.

Also use LXC image for make-archive.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a58ac9d50..5823535b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -587,9 +587,6 @@ obs:odvr:
 # }}}
 
 # pkg {{{
-.setup_apkg: &setup_apkg
-  - python3 -m pip install -U apkg
-
 .pkg_deb_extras: &pkg_deb_extras
   before_script:
     - apt update
@@ -606,7 +603,6 @@ obs:odvr:
     - lxc
     - amd64
   script:
-    - *setup_apkg
     # make sure the archive from pkg:make-archive is available
     - apkg info cache | grep archive/dev
     - apkg install --build-dep
@@ -619,14 +615,13 @@ obs:odvr:
 pkg:make-archive:
   # archive is created once and reused in other pkg jobs
   <<: *pkg_deb_extras
-  image: $CI_REGISTRY/packaging/apkg/ci/debian-11:apkg
+  image: $CI_REGISTRY/packaging/apkg/lxc/debian-11
   stage: pkg
   needs: []
   artifacts:
     paths:
       - pkg/
   script:
-    - *setup_apkg
     - apkg build-dep
     - apkg make-archive