From 86a655387c26cd25dde69cebd18b5ff9379fbe3e Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 9 Dec 2020 19:15:51 +0200 Subject: Android: restart emulator if it gets stuck during testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-4052 Pick-to: 6.0 Change-Id: Ie1a0d1c6b6c5cd0425b7ccf195ac57408142f3c3 Reviewed-by: Simo Fält --- .../coin_module_test_android_start_emulator.yaml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'coin') diff --git a/coin/instructions/coin_module_test_android_start_emulator.yaml b/coin/instructions/coin_module_test_android_start_emulator.yaml index fc5f259043..7fc034117c 100644 --- a/coin/instructions/coin_module_test_android_start_emulator.yaml +++ b/coin/instructions/coin_module_test_android_start_emulator.yaml @@ -3,21 +3,10 @@ instructions: - type: Group instructions: - type: ExecuteCommand - command: ["{{.Env.ANDROID_SDK_HOME}}/tools/emulator", "@x86emulator","-no-audio","-no-window","-gpu","swiftshader_indirect","-partition-size","4000"] - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 600 - userMessageOnFailure: "Failed to run emulator, check logs." - startInBackground: True - - type: ExecuteCommand - command: ["{{.Env.ANDROID_SDK_HOME}}/platform-tools/adb","devices"] - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 600 - userMessageOnFailure: "Failed to run adb, check logs." - - type: ExecuteCommand - command: ["{{.Env.ANDROID_SDK_HOME}}/platform-tools/adb","wait-for-device"] - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 1800 - userMessageOnFailure: "Failed to run adb, check logs." + command: "sh {{.SourceDir}}/util/android/android_emulator_launcher.sh" + maxTimeInSeconds: 300 + maxTimeBetweenOutput: 300 + userMessageOnFailure: "Failed to start emulator, check logs." enable_if: condition: property property: features -- cgit v1.2.3