increase QEMU_TIMEOUT for some 'upstream' autopkgtests to avoid timeouts on slow infra

LP: #1892358

4 files changed, 105 insertions, 0 deletions

diff --git a/debian/patches/lp1892358/0001-test-increase-qemu-timeout-for-TEST-08-and-TEST-09.patch b/debian/patches/lp1892358/0001-test-increase-qemu-timeout-for-TEST-08-and-TEST-09.patch
new file mode 100644
index 0000000000..e1900c9d47
--- /dev/null
+++ b/debian/patches/lp1892358/0001-test-increase-qemu-timeout-for-TEST-08-and-TEST-09.patch
@@ -0,0 +1,38 @@
+From eae1ef076d6b84e25c68ba543705f3fc1e07bd2c Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Date: Thu, 12 Dec 2019 13:37:27 +0100
+Subject: [PATCH] test: increase qemu timeout for TEST-08 and TEST-09
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1892358
+Origin: upstream, http://github.com/systemd/systemd/commit/eae1ef076d6b84e25c68ba543705f3fc1e07bd2c
+
+These tests two have shown to be flaky in Ubuntu test infrastructure,
+but got more reliable with increased timeouts of 300 seconds each.
+
+Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+---
+ test/TEST-08-ISSUE-2730/test.sh | 2 +-
+ test/TEST-09-ISSUE-2691/test.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/test/TEST-08-ISSUE-2730/test.sh
++++ b/test/TEST-08-ISSUE-2730/test.sh
+@@ -7,7 +7,7 @@
+ 
+ . $TEST_BASE_DIR/test-functions
+ SKIP_INITRD=yes
+-QEMU_TIMEOUT=180
++QEMU_TIMEOUT=300
+ FSTYPE=ext4
+ 
+ test_setup() {
+--- a/test/TEST-09-ISSUE-2691/test.sh
++++ b/test/TEST-09-ISSUE-2691/test.sh
+@@ -7,7 +7,7 @@
+ 
+ . $TEST_BASE_DIR/test-functions
+ SKIP_INITRD=yes
+-QEMU_TIMEOUT=90
++QEMU_TIMEOUT=300
+ 
+ test_setup() {
+     create_empty_image
diff --git a/debian/patches/lp1892358/0002-test-increase-timeout-for-TEST-17-UDEV-WANTS.patch b/debian/patches/lp1892358/0002-test-increase-timeout-for-TEST-17-UDEV-WANTS.patch
new file mode 100644
index 0000000000..eebae36eac
--- /dev/null
+++ b/debian/patches/lp1892358/0002-test-increase-timeout-for-TEST-17-UDEV-WANTS.patch
@@ -0,0 +1,24 @@
+From f775f613adaf8fb6005c5082eb387499370c4fd9 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Thu, 1 Nov 2018 19:54:48 +0900
+Subject: [PATCH] test: increase timeout for TEST-17-UDEV-WANTS
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1892358
+Origin: upstream, http://github.com/systemd/systemd/commit/f775f613adaf8fb6005c5082eb387499370c4fd9
+
+As the test randomly fails with timeout.
+This may fix #10274.
+---
+ test/TEST-17-UDEV-WANTS/test.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/test/TEST-17-UDEV-WANTS/test.sh
++++ b/test/TEST-17-UDEV-WANTS/test.sh
+@@ -6,7 +6,7 @@
+ TEST_NO_NSPAWN=1
+ 
+ . $TEST_BASE_DIR/test-functions
+-QEMU_TIMEOUT=180
++QEMU_TIMEOUT=300
+ 
+ test_setup() {
+     create_empty_image
diff --git a/debian/patches/lp1892358/0003-test-increase-qemu-timeout-for-TEST-18-and-TEST-19.patch b/debian/patches/lp1892358/0003-test-increase-qemu-timeout-for-TEST-18-and-TEST-19.patch
new file mode 100644
index 0000000000..6bcc79befb
--- /dev/null
+++ b/debian/patches/lp1892358/0003-test-increase-qemu-timeout-for-TEST-18-and-TEST-19.patch
@@ -0,0 +1,40 @@
+From e24619fddd4a9002af92f3fce38ba91b08d204e3 Mon Sep 17 00:00:00 2001
+From: Dan Streetman <ddstreet@canonical.com>
+Date: Thu, 15 Aug 2019 16:27:05 -0400
+Subject: [PATCH] test: increase qemu timeout for TEST-18 and TEST-19
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1892358
+Origin: upstream, http://github.com/systemd/systemd/commit/e24619fddd4a9002af92f3fce38ba91b08d204e3
+
+These tests runs under qemu, and on some testbeds, without acceleration.
+On those systems, the current 180 second overall test timeout is too
+short to run the test.
+
+Increasing the timeout to 600s should be enough, even for slow
+non-accelerated qemu testbeds.
+---
+ test/TEST-18-FAILUREACTION/test.sh | 2 +-
+ test/TEST-19-DELEGATE/test.sh      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/test/TEST-18-FAILUREACTION/test.sh
++++ b/test/TEST-18-FAILUREACTION/test.sh
+@@ -5,7 +5,7 @@
+ TEST_DESCRIPTION="FailureAction= operation"
+ 
+ . $TEST_BASE_DIR/test-functions
+-QEMU_TIMEOUT=180
++QEMU_TIMEOUT=600
+ 
+ test_setup() {
+     create_empty_image
+--- a/test/TEST-19-DELEGATE/test.sh
++++ b/test/TEST-19-DELEGATE/test.sh
+@@ -6,7 +6,7 @@
+ TEST_NO_NSPAWN=1
+ 
+ . $TEST_BASE_DIR/test-functions
+-QEMU_TIMEOUT=180
++QEMU_TIMEOUT=600
+ UNIFIED_CGROUP_HIERARCHY=yes
+ 
+ test_setup() {
diff --git a/debian/patches/series b/debian/patches/series
index 50c0557464..b8f5b96b64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -223,3 +223,6 @@ lp1832754/0002-umount-Don-t-bother-remounting-api-and-ro-filesystem.patch
 lp1886115-pid1-fix-free-of-uninitialized-pointer-in-unit_fail_.patch
 lp1830746-bump-mlock-ulimit-to-64Mb.patch
 lp1896614-core-Avoid-race-when-starting-dbus-services.patch
+lp1892358/0001-test-increase-qemu-timeout-for-TEST-08-and-TEST-09.patch
+lp1892358/0002-test-increase-timeout-for-TEST-17-UDEV-WANTS.patch
+lp1892358/0003-test-increase-qemu-timeout-for-TEST-18-and-TEST-19.patch