This will tag tests for which upgrade tests would fail.
This is a pre-requisite for upgrade test patch [1].
When upgrade tests (from [1]) are run, tests tagged with
TAG_TEST_NOT_UPGRADABLE will be skipped.

The "NOT_UPGRADABLE" test would fail since patch [2] added a
new table, which is unexpected by the old test.

[1] ci: Run system tests in upgrade scenario
[2] controller: Learn EVPN workload FDB from the ingress traffic

Signed-off-by: Xavier Simonart <[email protected]>
---
 tests/ovn-macros.at | 6 ++++++
 tests/system-ovn.at | 1 +
 2 files changed, 7 insertions(+)

diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
index 94a0d61ef..0b8599d31 100644
--- a/tests/ovn-macros.at
+++ b/tests/ovn-macros.at
@@ -1493,6 +1493,12 @@ m4_define([TAG_UNSTABLE], [
     AT_SKIP_IF([test X"$SKIP_UNSTABLE" = Xyes])
 ])
 
+# TAG_TEST_NOT_UPGRADABLE tag indicates that the test would fail
+# "upgrade" test (i.e. running old ovn-northd and new ovn-controller)
+m4_define([TAG_TEST_NOT_UPGRADABLE], [
+    AT_SKIP_IF([test X"$UPGRADE_TEST" = Xyes])
+])
+
 m4_define([OVN_CHECK_SCAPY_EDNS_CLIENT_SUBNET_SUPPORT],
 [
     AT_SKIP_IF([test $HAVE_SCAPY = no])
diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index 6aca7b7df..efe6ff545 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -17500,6 +17500,7 @@ AT_CLEANUP
 OVN_FOR_EACH_NORTHD([
 AT_SETUP([dynamic-routing - EVPN])
 AT_KEYWORDS([dynamic-routing])
+TAG_TEST_NOT_UPGRADABLE
 
 CHECK_VRF()
 CHECK_CONNTRACK()
-- 
2.47.1

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to