From 2f3b234d6c776099acef1b3d3ce4cdad25240677 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Fri, 2 Jul 2021 11:55:17 +0300 Subject: [PATCH] Apply custom timeouts to cross compilations Pick-to: 6.2 Change-Id: I93ce6b6a6011a0883820f291121d7374391494c6 Reviewed-by: Michal Klocek --- ...compilation_module_build_instructions.yaml | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml index e5e257f181..8df1720be6 100644 --- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml +++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml @@ -1,5 +1,19 @@ type: Group instructions: + - type: EnvironmentVariable + variableName: CMAKE_BUILD_TIMEOUT + variableValue: "6000" + enable_if: + condition: runtime + env_var: CMAKE_BUILD_TIMEOUT + equals_value: null + - type: EnvironmentVariable + variableName: CMAKE_BUILD_OUTPUT_TIMEOUT + variableValue: "1200" + enable_if: + condition: runtime + env_var: CMAKE_BUILD_OUTPUT_TIMEOUT + equals_value: null - type: MakeDirectory directory: .git - type: MakeDirectory @@ -23,8 +37,8 @@ instructions: - !include "{{qt/qtbase}}/call_host_cmake.yaml" - type: ExecuteCommand command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 + maxTimeInSeconds: "{{.Env.CMAKE_BUILD_TIMEOUT}}" + maxTimeBetweenOutput: "{{.Env.CMAKE_BUILD_OUTPUT_TIMEOUT}}" userMessageOnFailure: > Failed to build sources. In the current state bug can be everywhere. - type: EnvironmentVariable @@ -53,8 +67,8 @@ instructions: - !include "{{qt/qtbase}}/call_target_cmake.yaml" - type: ExecuteCommand command: "{{.Env.TARGET_ENV_PREFIX}} cmake --build . --parallel -v" - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 + maxTimeInSeconds: "{{.Env.CMAKE_BUILD_TIMEOUT}}" + maxTimeBetweenOutput: "{{.Env.CMAKE_BUILD_OUTPUT_TIMEOUT}}" userMessageOnFailure: > Failed to build sources. In the current state bug can be everywhere. - type: EnvironmentVariable