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

[Frode Nordahl]

diff --git a/debian/changelog b/debian/changelog
index 7ed7cd9..a9fa96b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ovn (22.06.0-0ubuntu3) UNRELEASED; urgency=medium
   * d/rules, d/ovn-common.install: Properly fix the ovn-detrace binary
     (LP: #1971178).
   * d/gbp.conf: Add the package components.
+  * d/rules, d/flaky-tests.txt: Extend skip test list.
 
- -- Frode Nordahl <[e-mail]>  Mon, 15 Aug 2022 17:51:52 +0200
+ -- Frode Nordahl <[e-mail]>  Wed, 31 Aug 2022 06:38:49 +0200
 
 ovn (22.06.0-0ubuntu2) kinetic; urgency=medium
 
diff --git a/debian/flaky-tests.txt b/debian/flaky-tests.txt
index 2c1b0f4..e046eed 100644
--- a/debian/flaky-tests.txt
+++ b/debian/flaky-tests.txt
@@ -2,3 +2,12 @@ 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
+ACL logging
+ovn-controller incremental processing
+ACL allow-stateless omit conntrack - Logical_Switch
+ACL allow-stateless omit conntrack - Port_Group
+ACL allow-stateless overrides stateful rules with higher priority - Logical_Switch
+conntrack nat implies conntrack
+LS default ACL drop
+nb_cfg timestamp
+northd ssl file change
diff --git a/debian/rules b/debian/rules
index 130b533..7398048 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ override_dh_auto_configure:
 		--enable-ssl \
 		--with-vif-plug-provider=$(CURDIR)/ovn-vif
 
-# Last Review: 22.03.0
+# Last Review: 22.06.0
 # https://bugs.launchpad.net/ubuntu/+source/ovn/+bug/1956749
 TEST_LIST = $(shell \
 		$(CURDIR)/debian/testlist.py \