Merge branch '4635-add-rbt-ci-job' into 'main'

Add jobs for RBT zone- & cache-enabled GCC builds

Closes #4635

See merge request isc-projects/bind9!8997

.gitlab-ci.yml

@@ -889,6 +889,30 @@ unit:gcc:bookworm:amd64:
     - job: gcc:bookworm:amd64
       artifacts: true
 
+# Jobs for RBT zone- & cache-enabled GCC builds on Debian 12 "bookworm" (amd64)
+
+gcc:bookworm:rbt:amd64:
+  variables:
+    CC: gcc
+    CFLAGS: "${CFLAGS_COMMON}"
+    EXTRA_CONFIGURE: "--with-libidn2 --with-zonedb=rbt --with-cachedb=rbt"
+  <<: *debian_bookworm_amd64_image
+  <<: *build_job
+
+system:gcc:bookworm:rbt:amd64:
+  <<: *debian_bookworm_amd64_image
+  <<: *system_test_job
+  needs:
+    - job: unit:gcc:bookworm:rbt:amd64
+      artifacts: true
+
+unit:gcc:bookworm:rbt:amd64:
+  <<: *debian_bookworm_amd64_image
+  <<: *unit_test_job
+  needs:
+    - job: gcc:bookworm:rbt:amd64
+      artifacts: true
+
 # Build job for cross-compiled GCC builds on 64-bit Debian 12 "bookworm"
 # (amd64) with 32-bit BIND 9.
 

bin/tests/system/xferquota/tests_xferquota.py

@@ -31,13 +31,17 @@ def test_xferquota(named_port, servers):
 
     def check_line_count():
         matching_line_count = 0
-        # Iterate through zone files and count matching lines
+        # Iterate through zone files and count matching lines (records)
         for file_path in glob.glob("ns2/zone000*.example.bk"):
-            with open(file_path, "r", encoding="utf-8") as zonefile:
-                # Count the number of lines containing the search string
-                for line in zonefile:
-                    if re.search(r"xyzzy.zone[0-9]+.example.*A\s+10\.0\.0\.2", line):
-                        matching_line_count += 1
+            zone = dns.zone.from_file(
+                file_path, origin=file_path[4:-2], relativize=False
+            )
+            for name, _ttl, rdata in zone.iterate_rdatas(rdtype="A"):
+                if (
+                    re.fullmatch("xyzzy.zone[0-9]+.example.", name.to_text())
+                    and rdata.to_text() == "10.0.0.2"
+                ):
+                    matching_line_count += 1
         return matching_line_count == 300
 
     isctest.run.retry_with_timeout(check_line_count, timeout=360)