selftests: ovpn: reduce remaining ping flood counts

Commit 201ba706318d ("selftests: ovpn: reduce ping count in test.sh")
lowered the baseline traffic flood ping count to avoid flakes on slower
CI instances, however some instances were left out.

Apply the same limit to the remaining ovpn selftest flood pings that
still request 500 packets.

Fixes: 201ba706318d ("selftests: ovpn: reduce ping count in test.sh")
Signed-off-by: Ralf Lici <ralf@mandelbit.com>
Signed-off-by: Antonio Quartulli <antonio@openvpn.net>

diff --git a/tools/testing/selftests/net/ovpn/test-close-socket.sh b/tools/testing/selftests/net/ovpn/test-close-socket.sh
index af1532b4d2da7964fbff8813699316702a58b319..ec9a51bbf3c926474bc81e7574470b851e3f468b 100755 (executable)
--- a/tools/testing/selftests/net/ovpn/test-close-socket.sh
+++ b/tools/testing/selftests/net/ovpn/test-close-socket.sh
@@ -53,7 +53,7 @@ ovpn_run_ping_traffic() {
 
        for p in $(seq 1 ${OVPN_NUM_PEERS}); do
                ovpn_cmd_ok "send ping traffic to peer ${p}" \
-                       ip netns exec ovpn_peer0 ping -qfc 500 -w 3 \
+                       ip netns exec ovpn_peer0 ping -qfc 100 -w 3 \
                                5.5.5.$((p + 1))
        done
 }

diff --git a/tools/testing/selftests/net/ovpn/test-mark.sh b/tools/testing/selftests/net/ovpn/test-mark.sh
index 5a8f47554286282572ea0dccfdcf56de5557d82a..7c1d56e9c525d597f2f314b1f45b2c9238eaa5b0 100755 (executable)
--- a/tools/testing/selftests/net/ovpn/test-mark.sh
+++ b/tools/testing/selftests/net/ovpn/test-mark.sh
@@ -66,7 +66,7 @@ ovpn_mark_run_baseline_traffic() {
 
        for p in $(seq 1 3); do
                ovpn_cmd_ok "send baseline traffic to peer ${p}" \
-                       ip netns exec ovpn_peer0 ping -qfc 500 -w 3 \
+                       ip netns exec ovpn_peer0 ping -qfc 100 -w 3 \
                                5.5.5.$((p + 1))
        done
 }
@@ -101,7 +101,7 @@ ovpn_mark_verify_drop_traffic() {
        local total_count
 
        for p in $(seq 1 3); do
-               if ping_output=$(ip netns exec ovpn_peer0 ping -qfc 500 -w 1 \
+               if ping_output=$(ip netns exec ovpn_peer0 ping -qfc 100 -w 1 \
                        5.5.5.$((p + 1)) 2>&1); then
                        printf '%s\n' "expected ping to peer ${p} to fail \
                                after nft drop rule"
@@ -144,7 +144,7 @@ ovpn_mark_verify_traffic_recovery() {
        sleep 1
        for p in $(seq 1 3); do
                ovpn_cmd_ok "send recovery traffic to peer ${p}" \
-                       ip netns exec ovpn_peer0 ping -qfc 500 -w 3 \
+                       ip netns exec ovpn_peer0 ping -qfc 100 -w 3 \
                                5.5.5.$((p + 1))
        done
 }

diff --git a/tools/testing/selftests/net/ovpn/test.sh b/tools/testing/selftests/net/ovpn/test.sh
index c06e3135fbef8eab9b5bb862747b3d97780d1fa0..9b5610837032f0c7aad3c9ff7d3a75495fb2f07f 100755 (executable)
--- a/tools/testing/selftests/net/ovpn/test.sh
+++ b/tools/testing/selftests/net/ovpn/test.sh
@@ -110,7 +110,7 @@ ovpn_run_basic_traffic() {
 
 ovpn_run_lan_traffic() {
        ovpn_cmd_ok "ping LAN behind peer1" \
-               ip netns exec ovpn_peer0 ping -qfc 500 -w 3 "${OVPN_LAN_IP}"
+               ip netns exec ovpn_peer0 ping -qfc 100 -w 3 "${OVPN_LAN_IP}"
 }
 
 ovpn_run_float_mode() {
@@ -127,7 +127,7 @@ ovpn_run_float_mode() {
        for p in $(seq 1 ${OVPN_NUM_PEERS}); do
                peer_ns="ovpn_peer${p}"
                ovpn_cmd_ok "ping tunnel after float peer ${p}" \
-                       ip netns exec "${peer_ns}" ping -qfc 500 -w 3 5.5.5.1
+                       ip netns exec "${peer_ns}" ping -qfc 100 -w 3 5.5.5.1
        done
 }