From 63144841ee813bf2cdddb90702cb3490ee4228f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 15 Jun 2021 13:59:06 +0300 Subject: 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 Reviewed-by: Friedemann Kleint --- coin/instructions/common_environment.yaml | 3 +++ coin/instructions/execute_test_instructions.yaml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'coin') 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,5 +1,8 @@ type: Group instructions: + - type: EnvironmentVariable + variableName: QTEST_ENVIRONMENT + variableValue: "ci" - type: EnvironmentVariable variableName: TARGET_ARCHITECTURE variableValue: amd64 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 -- cgit v1.2.3