diff options
| author | Simo Fält <simo.falt@qt.io> | 2021-06-15 10:14:30 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2021-12-01 14:49:03 +0000 |
| commit | 4debb1824ab57fc1529db630f51366ece7398f74 (patch) | |
| tree | dfa6ab6b3de19c096f9f478493dbe74f3c6ac1f1 /coin | |
| parent | e94154f02bf8f93e812dcc4edb633b9fd03331b0 (diff) | |
Enable CI test on arm64
Pick-to: 6.2
Pick-to: 6.2.2
Change-Id: I26aff00644d85931b5e8ac597c1c5c3c9edb74e9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/common_environment.yaml | 7 | ||||
| -rw-r--r-- | coin/instructions/execute_test_instructions.yaml | 26 | ||||
| -rw-r--r-- | coin/module_config.yaml | 22 |
3 files changed, 52 insertions, 3 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 27fd61fb8..de83714e5 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 diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 896b39d25..967d57a8d 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -33,6 +33,28 @@ accept_configuration: - condition: property property: features contains_value: TestOnly + - condition: and + conditions: + - condition: property + property: host.osVersion + equals_value: MacOS_11_00 + - condition: property + property: features + contains_value: Packaging + - condition: and + conditions: + - condition: property + property: host.osVersion + equals_value: MacOS_11_00 + - condition: property + property: host.arch + equals_value: ARM64 + - condition: property + property: features + contains_value: TestOnly + - condition: property + property: features + contains_value: Packaging machine_type: Build: |