Merge ~paelzer/britney/+git/hints-ubuntu:mitigate-flaky-apt-clone into ~ubuntu-release/britney/+git/hints-ubuntu:devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

For details please see the old discussion that led to the badtest in the past in bug 1510060 and my recheck that shows it to be still the same issue in bug 1902830.

[Christian Ehrhardt  (paelzer)]

FYI there actually is a fix that we can upload instead or in addition to this badtest.
See: https://bugs.launchpad.net/ubuntu/+source/apt-clone/+bug/1902830/comments/3

[Christian Ehrhardt  (paelzer)]

FYI sshuttle tests are resolved by some combined test triggers (also held python-apt back).

apt-clone will eventually be resolved by https://code.launchpad.net/~paelzer/apt-clone/apt-clone-fix-fails-early-cycle/+merge/393310 as it seems to become approved.

Due to that I'm changing this change here to be a reset-test on the current version.
We know the current one is bad and need to unblock things asap.
At the same time we now know/expect that the next version will be good - so a reset will do.

Together that would to asap unblock the effect of bug 1902830 on a bunch of automated testing that stalls early 21.04 and after a new upload of apt-clone we have hopefully more reliable good results.

[Iain Lane (laney)]

Thanks.

Please could you take care of syncing apt-clone when it becomes available to sync? If it’s flaky then force-reset-test doesn’t help much of course.

Regarding sshuttle, the ‘extra’ triggers you added will need to be made to migrate too, otherwise future runs will probably keep on failing.

review: Approve

[Christian Ehrhardt  (paelzer)]

I wanted to sync this morning but MVO was faster and actually we'll need 0.4.3 but all that is going on. Thanks!

diff --git a/ubuntu-release b/ubuntu-release
index 6ee77b4..df0c778 100644
--- a/ubuntu-release
+++ b/ubuntu-release
@@ -10,7 +10,8 @@ force-reset-test abi-monitor/1.12-2/armhf abi-monitor/1.12-2/i386
 force-reset-test abi-monitor/1.12.2ubuntu1/amd64 abi-monitor/1.12.2ubuntu1/ppc64el
 force-reset-test adequate/0.15.1ubuntu5
 force-reset-test apparmor/2.13.3-7ubuntu6
-force-reset-test apt-clone/0.4.1ubuntu2
+# Keeps on regressing - see LP: #1510060 hopefully better after LP: #1902830
+force-reset-test apt-clone/0.4.1ubuntu5
 ## python removal
 force-reset-test apport/2.20.11-0ubuntu16
 ##