diff options
| author | Simo Fält <simo.falt@qt.io> | 2021-06-15 10:14:30 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-01 20:10:52 +0000 |
| commit | b0e4946a9b8cbdb115e7672ddecd48534f0a7515 (patch) | |
| tree | 1c2b67ce052569f848d8d5a1ec1e2920f63f1c72 /coin/instructions | |
| parent | a0d1543b0bb5ce5746a22d21fc413274994d7a3d (diff) | |
Enable CI test on arm64
Change-Id: I26aff00644d85931b5e8ac597c1c5c3c9edb74e9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 4debb1824ab57fc1529db630f51366ece7398f74)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin/instructions')
| -rw-r--r-- | coin/instructions/common_environment.yaml | 7 | ||||
| -rw-r--r-- | coin/instructions/execute_test_instructions.yaml | 26 |
2 files changed, 30 insertions, 3 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 27fe4a27a..fcbd97455 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -106,6 +106,13 @@ instructions: equals_value: Windows - type: PrependToEnvironmentVariable variableName: PATH + variableValue: "/Users/qt/.local/bin/:" + enable_if: + condition: property + property: host.osVersion + equals_value: MacOS_11_00 + - type: PrependToEnvironmentVariable + variableName: PATH variableValue: "/Users/qt/work/install/bin:" enable_if: condition: property diff --git a/coin/instructions/execute_test_instructions.yaml b/coin/instructions/execute_test_instructions.yaml index 71057d35e..803989e91 100644 --- a/coin/instructions/execute_test_instructions.yaml +++ b/coin/instructions/execute_test_instructions.yaml @@ -5,13 +5,33 @@ enable_if: not_contains_value: LicenseCheck instructions: - type: ExecuteCommand + command: "python3 -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=ARM64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: and + conditions: + - condition: property + property: host.osVersion + equals_value: MacOS_11_00 + - condition: property + property: host.arch + equals_value: ARM64 + userMessageOnFailure: > + Failed to execute test instructions on arm mac + - type: ExecuteCommand command: "python3 -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" maxTimeInSeconds: 14400 maxTimeBetweenOutput: 1200 enable_if: - condition: property - property: host.os - equals_value: MacOS + condition: and + conditions: + - condition: property + property: host.osVersion + equals_value: MacOS_11_00 + - condition: property + property: host.arch + equals_value: X86_64 userMessageOnFailure: > Failed to execute test instructions on osx - type: ExecuteCommand |