Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/ftrace-bump into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

BugLink: https://bugs.launchpad.net/bugs/2054789

ftrace:test.d--00basic--basic2.tc will take about 15 minutes to run on
a hardware with 288 CPU, and ftrace:test.d--direct--ftrace-direct.tc
will take about 120 minutes.

It's because it will spend about 6 seconds to offline a CPU during the
test. The more we have the longer it takes.

Bump the timeout threshold to 20 and 150 minutes respectively.

Also fix the arch check for amd64, platform.processor() is actually
returning 'x86_64' on AMD64 systems.

[Francis Ginther (fginther)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, uncommit changes removed.
Thanks!

diff --git a/ubuntu_kselftests_ftrace/control b/ubuntu_kselftests_ftrace/control
index 8dc0530..f460442 100644
--- a/ubuntu_kselftests_ftrace/control
+++ b/ubuntu_kselftests_ftrace/control
@@ -52,9 +52,11 @@ if result == 'GOOD':
                     clean_name = ftrace_sub_test.split('/selftests/ftrace/')[1].replace('/', '--')
                     test = "{}:{}".format(category, clean_name)
                     timeout_threshold = default_timeout
-                    if test == 'ftrace:test.d--direct--ftrace-direct.tc' and arch != 'riscv64':
-                        timeout_threshold = 60 * 60 # LP: #2028839, it will take 46 mins to run on system with 224 CPUs
-                    elif test == 'ftrace:test.d--event--subsystem-enable.tc' and arch == 'amd64':
+                    if test == 'ftrace:test.d--00basic--basic2.tc' and arch != 'riscv64':
+                        timeout_threshold = 60 * 20 # LP: #2054789, took 15 mins to run on system with 288 CPUs
+                    elif test == 'ftrace:test.d--direct--ftrace-direct.tc' and arch != 'riscv64':
+                        timeout_threshold = 60 * 150 # LP: #2028839, #2054789, took 120 mins to run on system with 288 CPUs
+                    elif test == 'ftrace:test.d--event--subsystem-enable.tc' and arch == 'x86_64':
                         timeout_threshold = 60 * 30 # LP: #2028839, it will take 18 mins to run on some amd64 systems
                     job.run_test_detail(NAME, test_name=test, tag=test, timeout=timeout_threshold)
 else: