Merge ~ahasenack/ubuntu/+source/bind9:mantic-dyndb-dep8-fixes into ubuntu/+source/bind9:ubuntu/devel

[Andreas Hasenack]

Skip the dyndb-test on i386, because bind-dyndb-ldap is not built on i386.

I opted to add the skipping logic to the test itself, instead of "Architecture:"[1] in d/control, because I can then also check for "Ubuntu", and this makes the test more suitable for sending to debian.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/bind9-dyndb-ldap/+packages

I'll trigger the test after the build is finished.

1. https://salsa.debian.org/ci-team/autopkgtest/-/blob/master/doc/README.package-tests.rst

[Bryce Harrington (bryce)]

LGTM, +1

Does error code 77 have a special significance in autopkgtest? I've not run into that before.

review: Approve

[Andreas Hasenack (ahasenack)]

> LGTM, +1
>
> Does error code 77 have a special significance in autopkgtest? I've not run
> into that before.

Yes, 77 means the test was skipped, but you also need to add the "skippable" restriction to d/t/control.

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

Approvers: ahasenack, bryce
Uploaders: ahasenack, bryce
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

Ahh, I'm afraid this won't work. bind-dyndb-ldap is being pulled in via d/t/control, and that's before the test script runs, obviously:

734s builddeps:/tmp/autopkgtest.4KbRaN/7-autopkgtest-satdep.dsc:i386 : Depends: bind9-dyndb-ldap:i386 but it is not installable

[Andreas Hasenack (ahasenack)]

I now pushed a different set of changes, please take another look.

These fix the i386 problem, and I also included a small fix that was not affecting the test, but is addressing something I had wrong in the ldap_bind9_dn ldap entry.

The tests finished, and here is the summary:

a) non-i386:

594s autopkgtest [16:51:38]: @@@@@@@@@@@@@@@@@@@@ summary
594s simpletest PASS
594s validation FLAKY non-zero exit status 1
594s zonetest PASS
594s dyndb-ldap PASS

b) i386:

260s autopkgtest [16:46:05]: @@@@@@@@@@@@@@@@@@@@ summary
260s dyndb-ldap SKIP Test declares architecture as not supported: i386
260s simpletest PASS
260s validation FLAKY non-zero exit status 1
260s zonetest PASS

The i386 exclusion will have to be part of our delta I'm afraid :/

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

Approvers: ahasenack, bryce
Uploaders: ahasenack, bryce
MP auto-approved

review: Approve

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

Approvers: ahasenack, bryce
Uploaders: ahasenack, bryce
MP auto-approved

review: Approve

Unmerged commits

25ced90... by Andreas Hasenack on 2023-08-30

changelog

a362cc3... by Andreas Hasenack on 2023-08-30

  * d/t/dyndb-ldap: fix for the ldap bind9 dn entry

e9d4140... by Andreas Hasenack on 2023-08-30

  * d/t/control: exclude the i386 architecture for the dyndb-ldap test,
    since bind9-dyndb-ldap is not available there on Ubuntu

diff --git a/debian/changelog b/debian/changelog
index bdf90e2..3952a8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bind9 (1:9.18.16-1ubuntu3) mantic; urgency=medium
+
+  * d/t/control: exclude the i386 architecture for the dyndb-ldap test,
+    since bind9-dyndb-ldap is not available there on Ubuntu
+  * d/t/dyndb-ldap: fix for the ldap bind9 dn entry
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 30 Aug 2023 10:14:04 -0300
+
 bind9 (1:9.18.16-1ubuntu2) mantic; urgency=medium
 
   * d/t/control, d/t/dyndb-ldap: add DEP8 test (LP: #2032650)
diff --git a/debian/tests/control b/debian/tests/control
index 09a620e..deea1ac 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,6 +16,7 @@ Depends: bind9,
 
 Tests: dyndb-ldap
 Restrictions: isolation-container, needs-root
+Architecture: !i386
 Depends: bind9,
          bind9-dyndb-ldap,
          slapd,
diff --git a/debian/tests/dyndb-ldap b/debian/tests/dyndb-ldap
index 5482bc0..019bf24 100644
--- a/debian/tests/dyndb-ldap
+++ b/debian/tests/dyndb-ldap
@@ -8,6 +8,7 @@ myhostname="dep8"
 ldap_admin_dn="cn=admin,${ldap_suffix}"
 ldap_admin_pw="secret"
 ldap_bind9_dn="uid=bind9,${ldap_suffix}"
+ldap_bind9_rdn="uid: bind9" # match ldap_bind9_dn
 ldap_bind9_pw="secretagain"
 
 cleanup() {
@@ -122,7 +123,7 @@ EOF
 create_bind9_uid() {
     ldapadd -x -D "${ldap_admin_dn}" -w "${ldap_admin_pw}" <<EOF
 dn: ${ldap_bind9_dn}
-uid: replicator
+${ldap_bind9_rdn}
 objectClass: simpleSecurityObject
 objectClass: account
 userPassword: {CRYPT}x