Merge ~ahasenack/ubuntu/+source/isc-kea:lunar-isc-kea-apparmor-on-armhf into ubuntu/+source/isc-kea:ubuntu/devel

[Andreas Hasenack]

At first I thought this was related to apparmor, hence the branch name, but that's not the case.

I made some changes here:
- give dhclient a bigger timeout. DHCP requests have a backoff time window.
- show more logs when it fails
- fix an actual issue with the regexp for /etc/resolv.conf

[Andreas Hasenack (ahasenack)]

The test failure happened only on ubuntu, not debian, but I'll send this to debian and get the package back in sync.

[Athos Ribeiro (athos-ribeiro)]

Thanks, Andreas.

This LGTM!

However, I do not have means to run these dep8 changes on arm ATM. It would be nice to either trigger these tests in a PPA or ensure they are passing before uploading.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, athos-ribeiro
Uploaders: ahasenack, athos-ribeiro
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

Tests are green

[Andreas Hasenack (ahasenack)]

Uploading isc-kea_2.2.0-3ubuntu1.dsc
Uploading isc-kea_2.2.0-3ubuntu1.debian.tar.xz
Uploading isc-kea_2.2.0-3ubuntu1_source.buildinfo
Uploading isc-kea_2.2.0-3ubuntu1_source.changes

I'll create a salsa PR once these tests run and pass in our real infra.

diff --git a/debian/changelog b/debian/changelog
index 23d5306..bb30f8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+isc-kea (2.2.0-3ubuntu1) lunar; urgency=medium
+
+  * d/t/kea-dhcp4: make the test more robust (LP: #2007855):
+    - increase dhclient timeout to 60s, and run in verbose mode
+    - show logs in the case of failure
+    - set +e inside the cleanup handler
+    - fix resolv.conf regexp
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 20 Feb 2023 20:27:11 -0300
+
 isc-kea (2.2.0-3) unstable; urgency=medium
 
   [ Andreas Hasenack ]
diff --git a/debian/control b/debian/control
index 7ed285a..7506b58 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: isc-kea
 Section: net
 Priority: optional
-Maintainer: Kea <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Kea <[e-mail]>
 Uploaders:
  Adam Majer <[e-mail]>,
  Ondřej Surý <[e-mail]>,
diff --git a/debian/tests/kea-dhcp4 b/debian/tests/kea-dhcp4
index 6b02cdb..1a2bb66 100644
--- a/debian/tests/kea-dhcp4
+++ b/debian/tests/kea-dhcp4
@@ -15,20 +15,31 @@ declare -A dhcp4_config
 resolv_conf_bkp=$(mktemp)
 
 cleanup() {
-    if [ $? -ne 0 ]; then
+    rc=$?
+    set +e # so we don't exit midcleanup
+    if [ ${rc} -ne 0 ]; then
         echo "## FAIL"
+        echo
+        echo "## dmesg"
+        dmesg -T | tail -n 500
+        echo
+        echo "## kea logs"
+        journalctl -u kea-dhcp4-server.service
     fi
+    echo
     echo "## Cleaning up"
-    ip link set "${server_iface}" down || :
-    ip link del "${server_iface}" || :
-    ip link set "${bridge}" down || :
-    brctl delbr "${bridge}" || :
-    ip netns delete "${client_ns}" || :
-    sed -r -i "/example.autopkgtest/d" /etc/hosts || :
+    ip link set "${server_iface}" down
+    ip link del "${server_iface}"
+    ip link set "${bridge}" down
+    brctl delbr "${bridge}"
+    ip netns delete "${client_ns}"
+    sed -r -i "/example.autopkgtest/d" /etc/hosts
     if [ -s "${resolv_conf_bkp}" ]; then
         cat "${resolv_conf_bkp}" > /etc/resolv.conf
     fi
-    rm -f "${resolv_conf_bkp}" || :
+    rm -f "${resolv_conf_bkp}"
+    # restore it for when we are called from the main script, and not the trap
+    set -e
 }
 
 trap cleanup EXIT
@@ -161,7 +172,7 @@ sleep 2s
 
 echo
 echo "## Obtaining IP via dhclient"
-run_on_client timeout -v 20s dhclient "${client_iface}"
+run_on_client timeout -v 60s dhclient -v "${client_iface}"
 echo "## OK"
 
 ip=$(run_on_client ip -4 -o addr show dev "${client_iface}" | awk '{print $4}')
@@ -199,7 +210,7 @@ fi
 
 echo
 echo "## Checking that the DNS domain \"${test_domain}\" was added to resolv.conf"
-if grep -qE "^search[[:blank:]]+${test_domain//./\\.}" /etc/resolv.conf; then
+if grep -E "^search[[:blank:]]" /etc/resolv.conf | grep -q -w -F "${test_domain}"; then
     echo "## OK"
 else
     echo "## ERROR"
@@ -210,7 +221,7 @@ fi
 
 echo
 echo "## Releasing IP via dhclient -r"
-run_on_client timeout -v 20s dhclient -r
+run_on_client timeout -v 60s dhclient -v -r
 echo "## OK"
 
 echo