From ffff4ed6766fd14f3d3956ab22df021fb5808eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 23 Jul 2026 21:34:40 +0200 Subject: [PATCH] ci: cram: accept live br-lcm carrier state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The LCM bridge carrier reflects whether its container-side port is live. Split execution can inspect it before the LCM suite tears that state down, so the bridge can appear either live or without carrier. Carrier state is not the route line's only variable part: ip route also emits a trailing separator. Account for that separator after the optional linkdown flag so both carrier states match. Accept both observed route and link forms in every board's copy of the affected expectations while keeping every address, interface attribute, and the carrier-to-state pairing constrained. Assisted-by: codex:gpt-5 Assisted-by: claude:opus-5:orchestrator Assisted-by: codex:gpt-5.6-sol:medium-fast References: CI-7 Signed-off-by: Petr Štetiar --- .gitlab/tests/cram/arcadyan-mozart/010-network.t | 4 ++-- .gitlab/tests/cram/mxl25641-hdk-6/010-network.t | 4 ++-- .gitlab/tests/cram/nokia-valyrian/010-network.t | 4 ++-- .gitlab/tests/cram/prpl-haze/010-network.t | 4 ++-- .gitlab/tests/cram/turris-omnia/010-network.t | 4 ++-- .gitlab/tests/cram/wnc-freedom/010-network.t | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab/tests/cram/arcadyan-mozart/010-network.t b/.gitlab/tests/cram/arcadyan-mozart/010-network.t index c53427a46f..1afab13a42 100644 --- a/.gitlab/tests/cram/arcadyan-mozart/010-network.t +++ b/.gitlab/tests/cram/arcadyan-mozart/010-network.t @@ -9,14 +9,14 @@ Check correct routing table: 10.0.0.0/24 dev eth2 proto kernel scope link src 10.0.0.2 192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1 192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown - 192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown + 192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re) Check correct interface setup: $ R "ip link | grep ^\\\\d | cut -d: -f2-" | LC_ALL=C sort br-guest: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 br-lan: mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000 - br-lcm: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 + br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re) eth0: mtu 1504 qdisc mq state UP mode DEFAULT group default qlen 1000 eth1: mtu 1500 qdisc mq master br-lan state DOWN mode DEFAULT group default qlen 1000 eth2: mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000 diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/010-network.t b/.gitlab/tests/cram/mxl25641-hdk-6/010-network.t index 18aeb622c8..86b56337b6 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/010-network.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/010-network.t @@ -9,7 +9,7 @@ Check correct routing table: 10.0.0.0/24 dev eth1 proto kernel scope link src 10.0.0.2 192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1 192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown - 192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown + 192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re) Check correct interface setup: @@ -17,7 +17,7 @@ Check correct interface setup: br-guest: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 br-lan: mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000 - br-lcm: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 + br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re) cpu0_0_0: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 cpu0_1_0: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 cpu1_2_0: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 diff --git a/.gitlab/tests/cram/nokia-valyrian/010-network.t b/.gitlab/tests/cram/nokia-valyrian/010-network.t index 8c47c9f784..42b17970e5 100644 --- a/.gitlab/tests/cram/nokia-valyrian/010-network.t +++ b/.gitlab/tests/cram/nokia-valyrian/010-network.t @@ -9,14 +9,14 @@ Check correct routing table: 10.0.0.0/24 dev eth2 proto kernel scope link src 10.0.0.2 192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1 192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown - 192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown + 192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re) Check correct interface setup: $ R "ip link | grep ^\\\\d | cut -d: -f2-" | LC_ALL=C sort br-guest: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 br-lan: mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000 - br-lcm: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 + br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re) eth0: mtu 1504 qdisc mq state UNKNOWN mode DEFAULT group default qlen 1000 eth1: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 eth2: mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000 diff --git a/.gitlab/tests/cram/prpl-haze/010-network.t b/.gitlab/tests/cram/prpl-haze/010-network.t index 99d8d57db9..2528df4c57 100644 --- a/.gitlab/tests/cram/prpl-haze/010-network.t +++ b/.gitlab/tests/cram/prpl-haze/010-network.t @@ -9,14 +9,14 @@ Check correct routing table: 10.0.0.0/24 dev wan proto kernel scope link src 10.0.0.2 192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1 192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown - 192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown + 192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re) Check correct interface setup: $ R "ip link | grep ^\\\\d | cut -d: -f2-" | LC_ALL=C sort br-guest: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 br-lan: mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000 - br-lcm: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 + br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re) ip6tnl0@NONE: mtu 1452 qdisc noop state DOWN mode DEFAULT group default qlen 1000 lan1: mtu 1500 qdisc mq master br-lan state DOWN mode DEFAULT group default qlen 1000 lan2: mtu 1500 qdisc mq master br-lan state DOWN mode DEFAULT group default qlen 1000 diff --git a/.gitlab/tests/cram/turris-omnia/010-network.t b/.gitlab/tests/cram/turris-omnia/010-network.t index 3c380e10e8..6dfc6afbdf 100644 --- a/.gitlab/tests/cram/turris-omnia/010-network.t +++ b/.gitlab/tests/cram/turris-omnia/010-network.t @@ -9,14 +9,14 @@ Check correct routing table: 10.0.0.0/24 dev eth2 proto kernel scope link src 10.0.0.2 192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1 192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown - 192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown + 192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re) Check correct interface setup: $ R "ip link | grep ^\\\\d | cut -d: -f2-" | LC_ALL=C sort br-guest: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 br-lan: mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000 - br-lcm: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 + br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re) eth0: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1024 eth1: mtu 1508 qdisc mq state UP mode DEFAULT group default qlen 1024 eth2: mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1024 diff --git a/.gitlab/tests/cram/wnc-freedom/010-network.t b/.gitlab/tests/cram/wnc-freedom/010-network.t index bc4a774995..9b63584652 100644 --- a/.gitlab/tests/cram/wnc-freedom/010-network.t +++ b/.gitlab/tests/cram/wnc-freedom/010-network.t @@ -9,14 +9,14 @@ Check correct routing table: 10.0.0.0/24 dev wan proto kernel scope link src 10.0.0.2 192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1 192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown - 192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown + 192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re) Check correct interface setup: $ R "ip link | grep ^\\\\d | cut -d: -f2-" | grep -v 'wwan0' | LC_ALL=C sort br-guest: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 br-lan: mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000 - br-lcm: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 + br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re) erspan0@NONE: mtu 1450 qdisc noop state DOWN mode DEFAULT group default qlen 1000 gre0@NONE: mtu 1476 qdisc noop state DOWN mode DEFAULT group default qlen 1000 gretap0@NONE: mtu 1462 qdisc noop state DOWN mode DEFAULT group default qlen 1000