From 3350a8a5bab89ac13b16cf0574981c094369d751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 16 Nov 2025 12:30:39 +0000 Subject: [PATCH] ci: cram: mxl25641-hdk-6: allow 2nd vendor MAC OUI in backhaul SSID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We've added new OSPv2 B-Step board into testbed and cram backhaul tests failed: - backhaul_4C:BA:7D:*:*:* (glob) - backhaul_4C:BA:7D:*:*:* (glob) - backhaul_4C:BA:7D:*:*:* (glob) + backhaul_A8:C2:46:3D:42:5C + backhaul_A8:C2:46:3D:42:5C + backhaul_A8:C2:46:3D:42:5C So lets fix it by acknowledging the new MAC OUI as expected, while at it improve the matching using regexp. Link: https://gitlab.com/prpl-foundation/prplos/prplos/-/jobs/12103261692#L742 Signed-off-by: Petr Štetiar --- .gitlab/tests/cram/mxl25641-hdk-6/100-pwhm.t | 6 +++--- .../mxl25641-hdk-6/110-prplmesh-dataelements.t | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/100-pwhm.t b/.gitlab/tests/cram/mxl25641-hdk-6/100-pwhm.t index 4f85bdd320..9199d6b2d4 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/100-pwhm.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/100-pwhm.t @@ -50,9 +50,9 @@ Check default SSID status: Check default SSID configuration of access points: $ R "ba-cli -j -l WiFi.SSID.?0 | jsonfilter -e @[0]'[@.Alias != \"ep2g0\" && @.Alias != \"ep5g0\" && @.Alias != \"ep6g0\"].SSID'" | LC_ALL=C sort - backhaul_4C:BA:7D:*:*:* (glob) - backhaul_4C:BA:7D:*:*:* (glob) - backhaul_4C:BA:7D:*:*:* (glob) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) prplOS prplOS prplOS diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t index 10a9fcc56e..f9ea70ebb2 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t @@ -61,9 +61,9 @@ Check all AccessPoint.SSIDReference+ instances are disabled Down $ get_ssid_ssid - backhaul_4C:BA:7D:*:*:* (glob) - backhaul_4C:BA:7D:*:*:* (glob) - backhaul_4C:BA:7D:*:*:* (glob) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) prplOS prplOS prplOS @@ -163,9 +163,9 @@ Check that wireless is operating: Up $ get_ssid_ssid - backhaul_4C:BA:7D:*:*:* (glob) - backhaul_4C:BA:7D:*:*:* (glob) - backhaul_4C:BA:7D:*:*:* (glob) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) prplOSguest prplOSguest prplOSguest @@ -243,9 +243,9 @@ Check that wireless is disabled: Check that SSIDs did not change: $ get_ssid_ssid - backhaul_4C:BA:7D:*:*:* (glob) - backhaul_4C:BA:7D:*:*:* (glob) - backhaul_4C:BA:7D:*:*:* (glob) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) + backhaul_(4C:BA:7D|A8:C2:46):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re) prplOSguest prplOSguest prplOSguest