From ba08ae13ed252a6e8122884214e4e892d8bf0363 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Tue, 9 Aug 2022 07:28:53 +0200 Subject: [PATCH 1/2] d/flaky-tests-armel.txt, d/flaky-tests-armhf.txt: Extend list Signed-off-by: Frode Nordahl --- debian/flaky-tests-armel.txt | 1 + debian/flaky-tests-armhf.txt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/flaky-tests-armel.txt b/debian/flaky-tests-armel.txt index 6ce03bb10..2c9e87aa6 100644 --- a/debian/flaky-tests-armel.txt +++ b/debian/flaky-tests-armel.txt @@ -5,3 +5,4 @@ IP packet buffering test transport zones lflow cache for conjunctions nb_cfg timestamp +multi-vtep SB Chassis encap updates diff --git a/debian/flaky-tests-armhf.txt b/debian/flaky-tests-armhf.txt index 43654f3ae..4930cb6ca 100644 --- a/debian/flaky-tests-armhf.txt +++ b/debian/flaky-tests-armhf.txt @@ -7,3 +7,6 @@ multi-vtep SB Chassis encap updates ACL with Port Group conjunction flow efficiency ovn-ic -- gateway sync ipsec -- basic configuration +conflict ACLs with address set +northd ssl file change +check ovn-chassis-mac-mappings -- GitLab From 5f2de594ea92c881ec4ca5f189671a22085dcc3a Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Mon, 15 Aug 2022 17:36:53 +0200 Subject: [PATCH 2/2] d/rules, d/ovn-common.install: Properly fix the ovn-detrace binary (LP: #1971178). It is against policy to include files on PATH that have the implementation language specified as an extension. Instead let's remove the symlink that upstream installs and put the Python executable in its place. Signed-off-by: Frode Nordahl --- debian/ovn-common.install | 1 - debian/rules | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/ovn-common.install b/debian/ovn-common.install index 52e9e0050..9cc0fe09f 100644 --- a/debian/ovn-common.install +++ b/debian/ovn-common.install @@ -1,5 +1,4 @@ usr/bin/ovn-appctl -usr/bin/ovn_detrace.py usr/bin/ovn-detrace usr/bin/ovn-nbctl usr/bin/ovn-sbctl diff --git a/debian/rules b/debian/rules index 960dc6bf4..4bd12b9e8 100755 --- a/debian/rules +++ b/debian/rules @@ -67,6 +67,11 @@ override_dh_auto_clean: cd ovn-vif && make distclean | : rm -rf ovs +execute_after_dh_auto_install: + rm -f $(CURDIR)/debian/tmp/usr/bin/ovn-detrace + mv $(CURDIR)/debian/tmp/usr/bin/ovn_detrace.py \ + $(CURDIR)/debian/tmp/usr/bin/ovn-detrace + override_dh_installinit: # Package does not ship any init.d files dh_installinit --no-scripts -- GitLab