diff --git a/debian/flaky-tests-armel.txt b/debian/flaky-tests-armel.txt index 6ce03bb10abd570d7375e3693d64b7f725e24770..2c9e87aa6fdbb7deef61e376e4a4362f2bcc8b7a 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 43654f3ae15a679402420ff1ca6d728ba739f2a0..4930cb6cae153c2ff92de6c7f141dea7ad2b4c71 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 diff --git a/debian/ovn-common.install b/debian/ovn-common.install index 52e9e0050b86d34b4f4376747cc466b627a86da1..9cc0fe09f276a2757ca0fa967431aae2b7108a24 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 960dc6bf45b37bece35d39daf406a277d72299ab..4bd12b9e8fbf94db2f553bcd176fec26b7c4ada2 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