diff options
| author | Simo Fält <simo.falt@qt.io> | 2021-06-15 13:59:06 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2021-06-16 16:10:25 +0300 |
| commit | 63144841ee813bf2cdddb90702cb3490ee4228f1 (patch) | |
| tree | 8c5b72178dc7d031654bf14e7325f73f15927190 /coin | |
| parent | 10922e8f48bcd5a018465e663aeeae6023b3ef4c (diff) | |
Always set QTEST_ENVIRONMENT when run in Qt CI
Previously we set that only when running test.
Pick-to: 6.1
Change-Id: I2102e591737d0c9febf26406fb32ef33f1cb94dd
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/common_environment.yaml | 3 | ||||
| -rw-r--r-- | coin/instructions/execute_test_instructions.yaml | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 1c157f9a7..828891674 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -1,6 +1,9 @@ type: Group instructions: - type: EnvironmentVariable + variableName: QTEST_ENVIRONMENT + variableValue: "ci" + - type: EnvironmentVariable variableName: TARGET_ARCHITECTURE variableValue: amd64 enable_if: diff --git a/coin/instructions/execute_test_instructions.yaml b/coin/instructions/execute_test_instructions.yaml index 3a249e656..71057d35e 100644 --- a/coin/instructions/execute_test_instructions.yaml +++ b/coin/instructions/execute_test_instructions.yaml @@ -4,9 +4,6 @@ enable_if: property: features not_contains_value: LicenseCheck instructions: - - type: EnvironmentVariable - variableName: QTEST_ENVIRONMENT - variableValue: "ci" - 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 |