From: Lukáš Ježek <lukas.jezek@nic.cz>
Date: Mon, 11 May 2020 11:38:28 +0000 (+0200)
Subject: packaging tests: Remove dependency on knot-resolver-release package
X-Git-Tag: v5.1.2~6^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aaff720a0195b867f42938cb45f54f572d96ab7e;p=thirdparty%2Fknot-resolver.git

packaging tests: Remove dependency on knot-resolver-release package
---

diff --git a/daemon/packaging/centos/7/pre-run.sh b/daemon/packaging/centos/7/pre-run.sh
index 8a5dc17ff..ee15ec7fd 100755
--- a/daemon/packaging/centos/7/pre-run.sh
+++ b/daemon/packaging/centos/7/pre-run.sh
@@ -1,3 +1,8 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 yum update -y
-yum install -y https://secure.nic.cz/files/knot-resolver/knot-resolver-release.el.rpm
-yum install -y knot-resolver
+yum install -y wget epel-release
+
+# add build repository
+cd /etc/yum.repos.d/
+wget https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/CentOS_7_EPEL/home:CZ-NIC:knot-resolver-latest.repo
diff --git a/daemon/packaging/centos/7/rundeps b/daemon/packaging/centos/7/rundeps
index 85054f43b..806f0ae8d 100644
--- a/daemon/packaging/centos/7/rundeps
+++ b/daemon/packaging/centos/7/rundeps
@@ -1,3 +1,9 @@
+gnutls
+knot-libs
+libedit
+libuv
+lmdb-libs
+luajit
+systemd
 lua-basexx
-lua-psl
 lua-http
diff --git a/daemon/packaging/debian/10/pre-run.sh b/daemon/packaging/debian/10/pre-run.sh
index 01b4c5bf6..3a3906a44 100755
--- a/daemon/packaging/debian/10/pre-run.sh
+++ b/daemon/packaging/debian/10/pre-run.sh
@@ -1,7 +1,11 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 apt-get update
 apt-get install -y wget gnupg apt-utils
 
-wget https://secure.nic.cz/files/knot-resolver/knot-resolver-release.deb
-dpkg -i knot-resolver-release.deb
+echo 'deb http://download.opensuse.org/repositories/home:/CZ-NIC:/knot-resolver-latest/Debian_10/ /' > /etc/apt/sources.list.d/home:CZ-NIC:knot-resolver-latest.list
+wget -nv https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/Debian_10/Release.key -O Release.key
+apt-key add - < Release.key
 
 apt-get update
+apt-get upgrade -y
diff --git a/daemon/packaging/debian/9/pre-run.sh b/daemon/packaging/debian/9/pre-run.sh
index 01b4c5bf6..fa8d3776a 100755
--- a/daemon/packaging/debian/9/pre-run.sh
+++ b/daemon/packaging/debian/9/pre-run.sh
@@ -1,7 +1,11 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 apt-get update
 apt-get install -y wget gnupg apt-utils
 
-wget https://secure.nic.cz/files/knot-resolver/knot-resolver-release.deb
-dpkg -i knot-resolver-release.deb
+echo 'deb http://download.opensuse.org/repositories/home:/CZ-NIC:/knot-resolver-latest/Debian_9.0/ /' > /etc/apt/sources.list.d/home:CZ-NIC:knot-resolver-latest.list
+wget -nv https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/Debian_9.0/Release.key -O Release.key
+apt-key add - < Release.key
 
 apt-get update
+apt-get upgrade -y
diff --git a/daemon/packaging/fedora/30/pre-build.sh b/daemon/packaging/fedora/30/pre-build.sh
index 4d6c59f9c..e0a8e358a 100755
--- a/daemon/packaging/fedora/30/pre-build.sh
+++ b/daemon/packaging/fedora/30/pre-build.sh
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-dnf install -y wget
+dnf install -y wget 'dnf-command(config-manager)'
 
 dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/Fedora_30/home:CZ-NIC:knot-resolver-build.repo
 dnf install -y knot
-
+dnf upgrade -y
diff --git a/daemon/packaging/fedora/30/pre-run.sh b/daemon/packaging/fedora/30/pre-run.sh
index af5edf6a9..4a883a0ea 100755
--- a/daemon/packaging/fedora/30/pre-run.sh
+++ b/daemon/packaging/fedora/30/pre-run.sh
@@ -1,2 +1,6 @@
-dnf install -y https://secure.nic.cz/files/knot-resolver/knot-resolver-release.fedora.rpm
-dnf install -y knot-resolver
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+dnf install -y wget 'dnf-command(config-manager)'
+
+dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/Fedora_30/home:CZ-NIC:knot-resolver-latest.repo
+dnf upgrade -y
diff --git a/daemon/packaging/fedora/30/rundeps b/daemon/packaging/fedora/30/rundeps
index 75374405d..75c793b90 100644
--- a/daemon/packaging/fedora/30/rundeps
+++ b/daemon/packaging/fedora/30/rundeps
@@ -1,3 +1,7 @@
+"pkgconfig(libedit)"
+"pkgconfig(libknot)"
+"pkgconfig(libuv)"
+"pkgconfig(luajit)"
 lua5.1-basexx
 lua5.1-psl
 lua5.1-http
diff --git a/daemon/packaging/fedora/31/pre-build.sh b/daemon/packaging/fedora/31/pre-build.sh
index 4d9685dc1..7e279da5f 100755
--- a/daemon/packaging/fedora/31/pre-build.sh
+++ b/daemon/packaging/fedora/31/pre-build.sh
@@ -4,4 +4,4 @@ dnf install -y wget
 
 dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/Fedora_31/home:CZ-NIC:knot-resolver-build.repo
 dnf install -y knot
-
+dnf upgrade -y
diff --git a/daemon/packaging/fedora/31/pre-run.sh b/daemon/packaging/fedora/31/pre-run.sh
index af5edf6a9..b84b42de3 100755
--- a/daemon/packaging/fedora/31/pre-run.sh
+++ b/daemon/packaging/fedora/31/pre-run.sh
@@ -1,2 +1,6 @@
-dnf install -y https://secure.nic.cz/files/knot-resolver/knot-resolver-release.fedora.rpm
-dnf install -y knot-resolver
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+dnf install -y wget
+
+dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/Fedora_31/home:CZ-NIC:knot-resolver-latest.repo
+dnf upgrade -y
diff --git a/daemon/packaging/fedora/31/rundeps b/daemon/packaging/fedora/31/rundeps
index 75374405d..75c793b90 100644
--- a/daemon/packaging/fedora/31/rundeps
+++ b/daemon/packaging/fedora/31/rundeps
@@ -1,3 +1,7 @@
+"pkgconfig(libedit)"
+"pkgconfig(libknot)"
+"pkgconfig(libuv)"
+"pkgconfig(luajit)"
 lua5.1-basexx
 lua5.1-psl
 lua5.1-http
diff --git a/daemon/packaging/leap/15.2/pre-run.sh b/daemon/packaging/leap/15.2/pre-run.sh
index df782cf69..9b0b5da0f 100755
--- a/daemon/packaging/leap/15.2/pre-run.sh
+++ b/daemon/packaging/leap/15.2/pre-run.sh
@@ -1,3 +1,3 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
 zypper addrepo https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/openSUSE_Leap_15.2/home:CZ-NIC:knot-resolver-latest.repo
 zypper --no-gpg-checks refresh
-zypper install -y knot-resolver
diff --git a/daemon/packaging/leap/15.2/rundeps b/daemon/packaging/leap/15.2/rundeps
new file mode 100644
index 000000000..f6f7b1416
--- /dev/null
+++ b/daemon/packaging/leap/15.2/rundeps
@@ -0,0 +1,4 @@
+"pkgconfig(libedit)"
+"pkgconfig(libknot)"
+"pkgconfig(libuv)"
+"pkgconfig(luajit)"
diff --git a/daemon/packaging/ubuntu/16.04/pre-build.sh b/daemon/packaging/ubuntu/16.04/pre-build.sh
index 9b4516c23..5af89ab55 100755
--- a/daemon/packaging/ubuntu/16.04/pre-build.sh
+++ b/daemon/packaging/ubuntu/16.04/pre-build.sh
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # add build repository
 apt-get update
 apt-get install -y wget gnupg apt-utils
diff --git a/daemon/packaging/ubuntu/16.04/pre-run.sh b/daemon/packaging/ubuntu/16.04/pre-run.sh
index 01b4c5bf6..bb81453ad 100755
--- a/daemon/packaging/ubuntu/16.04/pre-run.sh
+++ b/daemon/packaging/ubuntu/16.04/pre-run.sh
@@ -1,7 +1,12 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# add build repository
 apt-get update
 apt-get install -y wget gnupg apt-utils
 
-wget https://secure.nic.cz/files/knot-resolver/knot-resolver-release.deb
-dpkg -i knot-resolver-release.deb
+echo 'deb http://download.opensuse.org/repositories/home:/CZ-NIC:/knot-resolver-latest/xUbuntu_16.04/ /' > /etc/apt/sources.list.d/home:CZ-NIC:knot-resolver-latest.list
+wget -nv https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/xUbuntu_16.04/Release.key -O Release.key
+apt-key add - < Release.key
 
 apt-get update
+apt-get upgrade -y
diff --git a/daemon/packaging/ubuntu/18.04/pre-build.sh b/daemon/packaging/ubuntu/18.04/pre-build.sh
index fad15505f..77551b806 100755
--- a/daemon/packaging/ubuntu/18.04/pre-build.sh
+++ b/daemon/packaging/ubuntu/18.04/pre-build.sh
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # add build repository
 apt-get update
 apt-get install -y wget gnupg apt-utils
diff --git a/daemon/packaging/ubuntu/18.04/pre-run.sh b/daemon/packaging/ubuntu/18.04/pre-run.sh
index 01b4c5bf6..71d2a324e 100755
--- a/daemon/packaging/ubuntu/18.04/pre-run.sh
+++ b/daemon/packaging/ubuntu/18.04/pre-run.sh
@@ -1,7 +1,12 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# add build repository
 apt-get update
 apt-get install -y wget gnupg apt-utils
 
-wget https://secure.nic.cz/files/knot-resolver/knot-resolver-release.deb
-dpkg -i knot-resolver-release.deb
+echo 'deb http://download.opensuse.org/repositories/home:/CZ-NIC:/knot-resolver-latest/xUbuntu_18.04/ /' > /etc/apt/sources.list.d/home:CZ-NIC:knot-resolver-latest.list
+wget -nv https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/xUbuntu_18.04/Release.key -O Release.key
+apt-key add - < Release.key
 
 apt-get update
+apt-get upgrade -y
diff --git a/modules/etcd/packaging/centos/7/rundeps b/modules/etcd/packaging/centos/7/rundeps
index 14ac3ed89..795a3c44f 100644
--- a/modules/etcd/packaging/centos/7/rundeps
+++ b/modules/etcd/packaging/centos/7/rundeps
@@ -2,3 +2,5 @@ openssl-devel
 lua-devel
 luarocks
 git
+gcc
+make
diff --git a/modules/etcd/packaging/debian/10/rundeps b/modules/etcd/packaging/debian/10/rundeps
index a355a9f82..02d3fcf5c 100644
--- a/modules/etcd/packaging/debian/10/rundeps
+++ b/modules/etcd/packaging/debian/10/rundeps
@@ -1,3 +1,4 @@
 libssl-dev
 luarocks
 git
+make
diff --git a/modules/etcd/packaging/debian/9/rundeps b/modules/etcd/packaging/debian/9/rundeps
index a355a9f82..02d3fcf5c 100644
--- a/modules/etcd/packaging/debian/9/rundeps
+++ b/modules/etcd/packaging/debian/9/rundeps
@@ -1,3 +1,4 @@
 libssl-dev
 luarocks
 git
+make
diff --git a/modules/etcd/packaging/leap/15.2/rundeps b/modules/etcd/packaging/leap/15.2/rundeps
index bfe317dfb..e8df59ba7 100644
--- a/modules/etcd/packaging/leap/15.2/rundeps
+++ b/modules/etcd/packaging/leap/15.2/rundeps
@@ -2,3 +2,5 @@ libopenssl-devel
 lua51-devel
 lua51-luarocks
 git
+gcc
+make
diff --git a/tests/packaging/test_packaging.py b/tests/packaging/test_packaging.py
index 3c97fbe5f..834aa9b7c 100644
--- a/tests/packaging/test_packaging.py
+++ b/tests/packaging/test_packaging.py
@@ -228,7 +228,8 @@ class CentosImage(DockerImages):
         return "yum install -y "
 
     def cmd_kresd_install(self):
-        return 'ninja-build -C build_packaging install >/dev/null'
+        #return 'ninja-build -C build_packaging install >/dev/null'
+        return 'ninja-build -C build_packaging install'
 
     def cmd_kresd_build(self):
         return """\\
@@ -242,11 +243,12 @@ class CentosImage(DockerImages):
                     --libdir=lib \\
                     --includedir=include \\
                     --sysconfdir=etc \\
+                    --default-library=static \\
                     -Dsystemd_files=enabled \\
                     -Dclient=enabled \\
                     -Dunit_tests=enabled \\
                     -Dmanaged_ta=enabled \\
-                    -Dkeyfile_default=/var/lib/knot-resolver/root.keys \\
+                    -Dkeyfile_default=/root/kresd/install_packaging/var/lib/knot-resolver/root.keys \\
                     -Dinstall_root_keys=enabled \\
                     -Dinstall_kresd_conf=enabled; \\
                 ninja-build -C build_packaging
@@ -276,11 +278,12 @@ class FedoraImage(DockerImages):
                     --libdir=lib \\
                     --includedir=include \\
                     --sysconfdir=etc \\
+                    --default-library=static \\
                     -Dsystemd_files=enabled \\
                     -Dclient=enabled \\
                     -Dunit_tests=enabled \\
                     -Dmanaged_ta=enabled \\
-                    -Dkeyfile_default=/var/lib/knot-resolver/root.keys \\
+                    -Dkeyfile_default=/root/kresd/install_packaging/var/lib/knot-resolver/root.keys \\
                     -Dinstall_root_keys=enabled \\
                     -Dinstall_kresd_conf=enabled; \\
                 ninja -C build_packaging
@@ -367,8 +370,7 @@ def buildenv(request, tmpdir_factory):
         tmpdir = tmpdir_factory.mktemp(distro['name']+distro['version'])
         img.build(tmpdir, tag=pytest.KR_PREFIX+distro['name']+distro['version']+'-build')
         img.build_run(tmpdir, img.build_id,
-                      tag=pytest.KR_PREFIX+distro['name']+distro['version']+'-run',
-                      from_image=img.build_id)
+                      tag=pytest.KR_PREFIX+distro['name']+distro['version']+'-run')
 
     yield img
 #    client.images.remove(img.run_id)
@@ -471,8 +473,8 @@ def test_collect(module, buildenv, tmp_path):
     finally:
         ch.stop()
         ch.container.remove()
-#        if buildmod is not None and buildmod is not buildenv:
-#            client.images.remove(buildmod.run_id)
-#            client.images.remove(buildmod.build_id)
+        if buildmod is not None and buildmod is not buildenv:
+            client.images.remove(buildmod.run_id)
+            client.images.remove(buildmod.build_id)
 
     assert(rcode == 0)