From 6fba8a46fc4ca10794388df9c4e9e4160901c91e Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 23 Jun 2021 15:38:41 +0200
Subject: [PATCH 1/2] ci: add rocky-8 pkgtest
---
ci/pkgtest.yaml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/ci/pkgtest.yaml b/ci/pkgtest.yaml
index 2e5a239f1..0623eba3f 100644
--- a/ci/pkgtest.yaml
+++ b/ci/pkgtest.yaml
@@ -105,6 +105,14 @@ opensuse-15.3:pkgbuild:
- zypper install -y rpm-build python3-pip
- *apkgbuild
+rocky-8:pkgbuild:
+ <<: *pkgbuild
+ image: $CI_REGISTRY/labs/lxc-gitlab-runner/rocky-8
+ script:
+ - dnf install -y rpm-build python3-pip epel-release dnf-plugins-core
+ - dnf config-manager --set-enabled powertools
+ - *apkgbuild
+
ubuntu-18.04:pkgbuild:
<<: *pkgbuild
image: $CI_REGISTRY/labs/lxc-gitlab-runner/ubuntu-18.04
@@ -259,6 +267,18 @@ opensuse-15.3:pkgtest:
- systemctl start kresd@1
- kdig @127.0.0.1 nic.cz | grep -qi NOERROR
+rocky-8:pkgtest:
+ <<: *pkgtest
+ needs:
+ - rocky-8:pkgbuild
+ image: $CI_REGISTRY/labs/lxc-gitlab-runner/rocky-8
+ script:
+ - dnf install -y epel-release
+ - dnf install -y knot-utils findutils
+ - dnf install -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module)
+ - systemctl start kresd@1
+ - kdig @127.0.0.1 nic.cz | grep -qi NOERROR
+
ubuntu-18.04:pkgtest:
<<: *pkgtest
needs:
--
GitLab
From d12f40bc9b6a51ec2a1da592e5d363f3f939262b Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 24 Jun 2021 17:17:21 +0200
Subject: [PATCH 2/2] ci/pkgtest: omit installing debug and devel packages
---
ci/pkgtest.yaml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/ci/pkgtest.yaml b/ci/pkgtest.yaml
index 0623eba3f..3854a3da3 100644
--- a/ci/pkgtest.yaml
+++ b/ci/pkgtest.yaml
@@ -170,7 +170,7 @@ nixos-unstable:pkgbuild:
.debpkgtest: &debpkgtest
- *pkgdebrepo
- apt-get install -y knot-dnsutils
- - apt-get install -y $(find ./pkg/pkgs -name '*.deb' | grep -v module)
+ - apt-get install -y $(find ./pkg/pkgs -name '*.deb' | grep -v module | grep -v debug | grep -v devel)
- systemctl start kresd@1
- kdig @127.0.0.1 nic.cz | grep -qi NOERROR
@@ -184,7 +184,7 @@ centos-7:pkgtest:
script:
- yum install -y epel-release
- yum install -y knot-utils findutils
- - yum install -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module)
+ - yum 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
@@ -228,7 +228,7 @@ fedora-33:pkgtest:
image: $CI_REGISTRY/labs/lxc-gitlab-runner/fedora-33
script:
- dnf install -y knot-utils findutils
- - dnf install -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module)
+ - 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
@@ -239,7 +239,7 @@ fedora-34:pkgtest:
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)
+ - 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
@@ -251,7 +251,7 @@ opensuse-15.2:pkgtest:
script:
- zypper addrepo -G -f https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/openSUSE_Leap_15.2/home:CZ-NIC:knot-resolver-build.repo
- zypper install -y knot-utils
- - zypper install --allow-unsigned-rpm -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module)
+ - zypper install --allow-unsigned-rpm -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
@@ -263,7 +263,7 @@ opensuse-15.3:pkgtest:
script:
- zypper addrepo -G -f https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/openSUSE_Leap_15.3/home:CZ-NIC:knot-resolver-build.repo
- zypper install -y knot-utils
- - zypper install --allow-unsigned-rpm -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module)
+ - zypper install --allow-unsigned-rpm -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
@@ -275,7 +275,7 @@ rocky-8:pkgtest:
script:
- dnf install -y epel-release
- dnf install -y knot-utils findutils
- - dnf install -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module)
+ - 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
--
GitLab