Merge ~fnordahl/ubuntu/+source/ovn:ubuntu/focal into ~ubuntu-server-dev/ubuntu/+source/ovn:ubuntu/focal

[Frode Nordahl]

Unmerged commits

6d9e777... by Frode Nordahl on 2022-07-20

release package ovn 20.03.2-0ubuntu0.20.04.4

Signed-off-by: Frode Nordahl <email address hidden>

da487a1... by Frode Nordahl on 2022-07-18

debian: Determine testlist at build time

The test numbers in the generated autotools testsuite change
whenever upstream adds more tests or extends the test matrix.

Make the flaky test skiplist more robust by programatically
determine the test numbers from the descriptions at build time.

Signed-off-by: Frode Nordahl <email address hidden>
(cherry picked from commit b6cb0d4e1d88f123a20cbc65d841741e4584f5f1)

diff --git a/debian/changelog b/debian/changelog
index 44ed514..e555d4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ovn (20.03.2-0ubuntu0.20.04.4) UNRELEASED; urgency=medium
+ovn (20.03.2-0ubuntu0.20.04.4) focal; urgency=medium
 
   * Adapt to changes made in previous OVS point release (LP: #1980213):
     - d/control: Update required openvswitch build requirement.
@@ -8,8 +8,10 @@ ovn (20.03.2-0ubuntu0.20.04.4) UNRELEASED; urgency=medium
       calling `ovn-ctl stop_controller`
     - d/p/lp-1940043-0001-Provide-the-option-to-pin-ovn-controller-and-ovn-nor.patch
     - d/p/lp-1940043-0002-controller-Allow-pinctrl-thread-to-handle-packet-ins.patch
+  * d/rules, d/testlist.py, d/flaky-tests.txt:
+    - Dynamically build list of tests to run from list of test descriptions.
 
- -- Frode Nordahl <[e-mail]>  Thu, 30 Jun 2022 09:50:14 +0000
+ -- Frode Nordahl <[e-mail]>  Wed, 20 Jul 2022 11:42:49 +0200
 
 ovn (20.03.2-0ubuntu0.20.04.3) focal; urgency=medium
 
diff --git a/debian/flaky-tests.txt b/debian/flaky-tests.txt
 new file mode 100644
index 0000000..2c1b0f4
--- /dev/null
+++ b/debian/flaky-tests.txt
@@ -0,0 +1,4 @@
+policy-based routing IPv6: 1 HVs, 3 LSs, 1 lport/LS, 1 LR
+ACLs on Port Groups
+multi-vtep SB Chassis encap updates
+ACL with Port Group conjunction flow efficiency
diff --git a/debian/rules b/debian/rules
index 9a528c1..cd3fb6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,12 @@ override_dh_auto_configure:
 		--with-ovs-source=$(CURDIR)/ovs \
 		--enable-ssl
 
+# https://bugs.launchpad.net/ubuntu/+source/ovn/+bug/1956749
+TEST_LIST = $(shell \
+		$(CURDIR)/debian/testlist.py \
+		$(CURDIR)/debian/flaky-tests.txt \
+		$(CURDIR)/tests/testsuite)
+
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	if $(MAKE) check TESTSUITEFLAGS='$(PARALLEL) $(TEST_LIST)' || \
diff --git a/debian/testlist.py b/debian/testlist.py
 new file mode 100755
index 0000000..24d2ae9
--- /dev/null
+++ b/debian/testlist.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+import enum
+import itertools
+import os
+import sys
+
+
+if len(sys.argv) < 3:
+    print(
+        "usage: {} skipdescriptionlist testsuite\n"
+        "\n"
+        "This program reads two files, a skiplist containing the \n"
+        "description of tests to skip separated by newline, and a \n"
+        "generated testsuite script.\n"
+        "\n"
+        "From this it produces string with range of tests to execute \n"
+        "which can be provided to the testsuite script.\n".format(sys.argv[0]),
+        file=sys.stderr,
+    )
+    sys.exit(os.EX_USAGE)
+
+
+SKIP_TEST_STRINGS = []
+with open(sys.argv[1]) as fin:
+    SKIP_TEST_STRINGS = [line.rstrip() for line in fin.readlines()]
+
+
[e-mail]
+class State(enum.Enum):
+    INIT = enum.auto()
+    AT_HELP_ALL = enum.auto()
+
+
+SKIP_TESTS = set()
+TESTS = set()
+with open(sys.argv[2]) as fin:
+    state = State.INIT
+    last_test = 0
+    for line in fin.readlines():
+        if state == State.INIT:
+            if not line.startswith('at_help_all="'):
+                continue
+            else:
+                state = State.AT_HELP_ALL
+                data = line.split('"')[1].rstrip().split(";")
+        elif state == State.AT_HELP_ALL:
+            if line.startswith('"'):
+                break
+            data = line.rstrip().split(";")
+        test_nr = int(data[0])
+        if last_test < test_nr:
+            last_test = test_nr
+        for skip_string in SKIP_TEST_STRINGS:
+            if skip_string in data[2]:
+                SKIP_TESTS.add(test_nr)
+            else:
+                TESTS.add(test_nr)
+
+
+def ranges(testlist):
+    for a, b in itertools.groupby(
+        enumerate(list(testlist)), lambda pair: pair[1] - pair[0]
+    ):
+        b = list(b)
+        yield b[0][1], b[-1][1]
+
+
+testranges = [
+    "{}-{}".format(testrange[0], testrange[1])
+    for testrange in ranges(TESTS - SKIP_TESTS)
+]
+print(" ".join(testranges))