Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'selftests-openvswitch-address-some-flakes-in-the-ci-environment'
Aaron Conole says:
====================
selftests: openvswitch: Address some flakes in the CI environment
These patches aim to make using the openvswitch testsuite more reliable.
These should address the major sources of flakiness in the openvswitch
test suite allowing the CI infrastructure to exercise the openvswitch
module for patch series. There should be no change for users who simply
run the tests (except that patch 3/3 does make some of the debugging a bit
easier by making some output more verbose).
====================
Link: https://patch.msgid.link/20240702132830.213384-1-aconole@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+16
-8
+15
-8
tools/testing/selftests/net/openvswitch/openvswitch.sh
+15
-8
tools/testing/selftests/net/openvswitch/openvswitch.sh
···
23
23
drop_reason drop: test drop reasons are emitted"
24
24
25
25
info() {
26
-
[ $VERBOSE = 0 ] || echo $*
26
+
[ "${ovs_dir}" != "" ] &&
27
+
echo "`date +"[%m-%d %H:%M:%S]"` $*" >> ${ovs_dir}/debug.log
28
+
[ $VERBOSE = 0 ] || echo $*
27
29
}
28
30
29
31
ovs_base=`pwd`
···
67
65
68
66
ovs_sbx() {
69
67
if test "X$2" != X; then
70
-
(ovs_setenv $1; shift; "$@" >> ${ovs_dir}/debug.log)
68
+
(ovs_setenv $1; shift;
69
+
info "run cmd: $@"; "$@" >> ${ovs_dir}/debug.log)
71
70
else
72
71
ovs_setenv $1
73
72
fi
···
142
139
info "Adding flow to DP: sbx:$1 br:$2 flow:$3 act:$4"
143
140
ovs_sbx "$1" python3 $ovs_base/ovs-dpctl.py add-flow "$2" "$3" "$4"
144
141
if [ $? -ne 0 ]; then
145
-
echo "Flow [ $3 : $4 ] failed" >> ${ovs_dir}/debug.log
142
+
info "Flow [ $3 : $4 ] failed"
146
143
return 1
147
144
fi
148
145
return 0
···
616
613
tname="$1"
617
614
tdesc="$2"
618
615
619
-
if ! lsmod | grep openvswitch >/dev/null 2>&1; then
620
-
stdbuf -o0 printf "TEST: %-60s [NOMOD]\n" "${tdesc}"
621
-
return $ksft_skip
622
-
fi
623
-
624
616
if python3 ovs-dpctl.py -h 2>&1 | \
625
617
grep -E "Need to (install|upgrade) the python" >/dev/null 2>&1; then
626
618
stdbuf -o0 printf "TEST: %-60s [PYLIB]\n" "${tdesc}"
627
619
return $ksft_skip
628
620
fi
621
+
622
+
python3 ovs-dpctl.py show >/dev/null 2>&1 || \
623
+
echo "[DPCTL] show exception."
624
+
625
+
if ! lsmod | grep openvswitch >/dev/null 2>&1; then
626
+
stdbuf -o0 printf "TEST: %-60s [NOMOD]\n" "${tdesc}"
627
+
return $ksft_skip
628
+
fi
629
+
629
630
printf "TEST: %-60s [START]\n" "${tname}"
630
631
631
632
unset IFS
+1
tools/testing/selftests/net/openvswitch/settings
+1
tools/testing/selftests/net/openvswitch/settings
···
1
+
timeout=900