From ab855504b58d71cdaf357e35f8d7b1693474561b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 22 Feb 2026 07:00:15 +0100 Subject: [PATCH] ci: cram: accept ntpsec ntpdate output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ntpsec-ntpdate 1.2.3 reports successful queries as a timestamp followed by numeric offset and uncertainty values instead of the former textual offset wording. Match the numeric ntpsec query format so the time test accepts the output provided by the Debian 13 testbed image. Assisted-by: codex:gpt-5 Signed-off-by: Petr Štetiar References: PPW-1258 --- .../generic/acceleration-plan-components/070-time.t | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/070-time.t b/.gitlab/tests/cram/generic/acceleration-plan-components/070-time.t index ab0b147b80..fe6b4ccda7 100644 --- a/.gitlab/tests/cram/generic/acceleration-plan-components/070-time.t +++ b/.gitlab/tests/cram/generic/acceleration-plan-components/070-time.t @@ -115,8 +115,8 @@ Check that Status has expected Synchronized state: Check that CPE can provide NTP to LAN clients: - $ ntpdate -q 192.168.1.1 2>&1 | grep adjust - .* adjust time server .* (re) + $ ntpdate -q 192.168.1.1 2>&1 | grep -E ' [-+][0-9.]+ \+/- [0-9.]+' + .* [-+][0-9.]+ \+/- [0-9.]+ .* (re) Disable NTP server for LAN clients: @@ -127,7 +127,7 @@ Disable NTP server for LAN clients: Check that CPE can't provide NTP to LAN clients: - $ ntpdate -q 192.168.1.1 2>&1 | grep adjust + $ ntpdate -q 192.168.1.1 2>&1 | grep -E ' [-+][0-9.]+ \+/- [0-9.]+' [1] Enable NTP server for LAN clients: @@ -139,8 +139,8 @@ Enable NTP server for LAN clients: Check that CPE provides again NTP to the LAN clients: - $ ntpdate -q 192.168.1.1 2>&1 | grep adjust - .* adjust time server .* (re) + $ ntpdate -q 192.168.1.1 2>&1 | grep -E ' [-+][0-9.]+ \+/- [0-9.]+' + .* [-+][0-9.]+ \+/- [0-9.]+ .* (re) Check default timezone: