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

[Po-Hsu Lin]

Test shows memcg_test_3 will take slightly over our current 60m
threshold, bump it to 75m to give it a chance to finish.

[Po-Hsu Lin (cypressyew)]

Patch tested on google@obruchev and it's working as expected.

[Francis Ginther (fginther)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, thanks!

diff --git a/ubuntu_ltp_controllers/ubuntu_ltp_controllers.py b/ubuntu_ltp_controllers/ubuntu_ltp_controllers.py
index 0de1218..b4b76a0 100644
--- a/ubuntu_ltp_controllers/ubuntu_ltp_controllers.py
+++ b/ubuntu_ltp_controllers/ubuntu_ltp_controllers.py
@@ -117,8 +117,8 @@ class ubuntu_ltp_controllers(test.test):
             return
 
         if test_name == 'memcg_test_3':
-            print("Set timeout multiplier LTP_TIMEOUT_MUL=120 for memcg_test_3 (lp:1836694)")
-            os.environ["LTP_TIMEOUT_MUL"] = '120'
+            print("Set timeout multiplier LTP_TIMEOUT_MUL=150 for memcg_test_3 (lp:1836694)")
+            os.environ["LTP_TIMEOUT_MUL"] = '150' # 75min
         elif test_name == 'memcg_stress':
             print("Set timeout multiplier LTP_TIMEOUT_MUL=2 for memcg_stress (lp:1946348)")
             os.environ["LTP_TIMEOUT_MUL"] = '2'