Merge pull request #22777 from dgibson/deprecated-addr

openshift-merge-bot[bot] · web-flow · commit c9241c990f20 · 2024-05-22T10:58:59.000Z
test, pasta: Ignore deprecated addresses in tests
diff --git a/test/system/helpers.network.bash b/test/system/helpers.network.bash
@@ -427,6 +427,6 @@ function default_addr() {
     local ip_ver="${1}"
     local ifname="${2:-$(default_ifname "${ip_ver}")}"
 
-    local expr='.[0] | .addr_info[0].local'
+    local expr='[.[0].addr_info[] | select(.deprecated != true)][0].local'
     ip -j -"${ip_ver}" addr show "${ifname}" | jq -rM "${expr}"
 }

Original file line number	Diff line number	Diff line change
`@@ -427,6 +427,6 @@ function default_addr() {`
`427`	`427`	`local ip_ver="${1}"`
`428`	`428`	`local ifname="${2:-$(default_ifname "${ip_ver}")}"`
`429`	`429`
`430`		`- local expr='.[0] \| .addr_info[0].local'`
	`430`	`+ local expr='[.[0].addr_info[] \| select(.deprecated != true)][0].local'`
`431`	`431`	`ip -j -"${ip_ver}" addr show "${ifname}" \| jq -rM "${expr}"`
`432`	`432`	`}`