From afc3ca5586ab28d6dadee6c384aa4b5ca9123354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 14 Jul 2026 10:03:58 +0200 Subject: [PATCH] ci: cram: verify-config-restore: accept multi-digit DNS aliases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the final DNS host check after configuration restore accepts only one digit in the generated alias. The failing testbed-02 job reaches instance 10, restores a valid object, and reports this Cram difference: - "Alias": "cpe-X_PRPLWARE-COM_Host-\d", (re) + "Alias": "cpe-X_PRPLWARE-COM_Host-10", The comparable testbed-01 control job reaches instance 9 and passes the same check. Both jobs successfully restore the DNS object, so the failure depends on the allocator crossing the single-digit boundary, not on invalid restored state. The additional testbed-02 topology from PCF-2504 is the supported trigger for the one-instance delta. It exposes the restrictive expectation but does not make the restored alias invalid. So lets fix the final alias expectation to accept one or more digits, matching the equivalent check earlier in the test. This keeps the test independent of the current multi-instance allocator position. Closes: PPW-1934 References: PCF-2504 Link: https://gitlab.com/prpl-foundation/prplos/prplos/-/jobs/15294595185 Link: https://gitlab.com/prpl-foundation/prplos/prplos/-/jobs/15300965299 Signed-off-by: Petr Štetiar --- .../040-verify-config-backup-and-restore.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/tests/cram/generic/verify-config-restore/040-verify-config-backup-and-restore.t b/.gitlab/tests/cram/generic/verify-config-restore/040-verify-config-backup-and-restore.t index 5445c25660..384f9172c1 100644 --- a/.gitlab/tests/cram/generic/verify-config-restore/040-verify-config-backup-and-restore.t +++ b/.gitlab/tests/cram/generic/verify-config-restore/040-verify-config-backup-and-restore.t @@ -207,7 +207,7 @@ Verify restored configuration after restart: $ R "ba-cli -l -j DNS.X_PRPLWARE-COM_Host.$DnsId3.\?" | jq --sort-keys '.[0]' { "DNS.X_PRPLWARE-COM_Host.\d+.": { (re) - "Alias": "cpe-X_PRPLWARE-COM_Host-\d", (re) + "Alias": "cpe-X_PRPLWARE-COM_Host-\d+", (re) "Enable": 1, "IPAddressNumberOfEntries": 0, "Interface": "",