From b40a4c5088951dfcecbf52cba83735f2e6c221a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Wed, 15 Sep 2021 14:25:24 +0300 Subject: CI: Enable building autotests for QNX QEMU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-87628 Change-Id: Id88daa2a08491b71d9d113ab02d0ca7806872a0e Reviewed-by: Alexandru Croitor Reviewed-by: Marianne Yrjänä (cherry picked from commit 11999a0aafa20bb733edea4a7a6093c2581a1c89) Reviewed-by: Qt Cherry-pick Bot --- coin/instructions/coin_module_test_template_v2.yaml | 2 +- coin/instructions/coin_module_test_template_v3.yaml | 2 +- coin/instructions/coin_qtbase_build_template_v2.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'coin') diff --git a/coin/instructions/coin_module_test_template_v2.yaml b/coin/instructions/coin_module_test_template_v2.yaml index 4691eff55a..25622763ff 100644 --- a/coin/instructions/coin_module_test_template_v2.yaml +++ b/coin/instructions/coin_module_test_template_v2.yaml @@ -14,7 +14,7 @@ instructions: equals_property: target.os - condition: property property: target.osVersion - equals_value: QEMU + in_values: [QEMU, QNX_710] disable_if: condition: property property: features diff --git a/coin/instructions/coin_module_test_template_v3.yaml b/coin/instructions/coin_module_test_template_v3.yaml index c3801c2dc9..4dee84fac9 100644 --- a/coin/instructions/coin_module_test_template_v3.yaml +++ b/coin/instructions/coin_module_test_template_v3.yaml @@ -14,7 +14,7 @@ instructions: equals_property: target.os - condition: property property: target.osVersion - equals_value: QEMU + in_values: [QEMU, QNX_710] - condition: property property: target.osVersion equals_value: IOS_ANY diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml index d6c8bea247..571a9f2088 100644 --- a/coin/instructions/coin_qtbase_build_template_v2.yaml +++ b/coin/instructions/coin_qtbase_build_template_v2.yaml @@ -26,7 +26,7 @@ instructions: enable_if: condition: property property: target.osVersion - in_values: [Android_ANY, QEMU, IOS_ANY] + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710] enable_if: condition: or conditions: -- cgit v1.2.3